Changeset 39187 in vbox for trunk

Timestamp:

Nov 3, 2011 1:03:59 PM (13 years ago)

Author:

vboxsync

Message:

mdv2011.0

Location:

trunk/src/VBox/Installer/linux

Files:

• distributions_rpm (modified) (1 diff)
• rpm/rules (modified) (3 diffs)

trunk/src/VBox/Installer/linux/distributions_rpm

@@ -8 +8 @@
 sles11.0        = SLES_11_0
 sles10.1        = SLES_10_1
+mdv2011.0       = MANDRIVA_2011_0
 mdv2010.0       = MANDRIVA_2010_0
 mdv2009.1       = MANDRIVA_2009_1

trunk/src/VBox/Installer/linux/rpm/rules

@@ -29 +29 @@
 $(error Fix /etc/permissions*)
 endif
+ifeq ($(shell if grep -q '^%disttag' /usr/lib/rpm/macros.d/mandriva 2>/dev/null; then echo yes; fi),yes)
+$(error Fix /usr/lib/rpm/macros.d/mandriva)
+endif
 
 verpkg   := VirtualBox-4.1
@@ -62 +65 @@
   rpmspec := rpm_suse
  endif
- ifeq ($(filter-out mdv2009.1 mdv2010.0,$(rpmrel)),)
+ ifeq ($(filter-out mdv2009.1 mdv2010.0 mdv2011.0,$(rpmrel)),)
   rpmspec := rpm_mdv
  endif
@@ -198 +201 @@
         rm -f /usr/src/packages/RPMS/*/VirtualBox*rpm
         rm -f /usr/src/packages/SPECS/*
-        rpmbuild -tb --clean rpm/VirtualBox.tar.bz2
+        (cd rpm; rpmbuild -tb --clean VirtualBox.tar.bz2)
         mv /usr/src/packages/RPMS/*/$(verpkg)-debug* $(pkgdir) || true
         file=`find /usr/src/packages/RPMS -name $(verpkg)*rpm -print`; \