Changeset 35230 in vbox

Timestamp:

Dec 17, 2010 4:29:34 PM (14 years ago)

Author:

vboxsync

Message:

deb/rpm: adaptions to r69058

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/rules (modified) (1 diff)
• rpm/VirtualBox.tmpl.spec (modified) (1 diff)
• rpm/rules (modified) (1 diff)

trunk/src/VBox/Installer/linux/debian/rules

@@ -265 +265 @@
         dh_installdocs \
             $(archdir)/UserManual*.pdf $(archdir)/VirtualBox*.chm \
-            $(addprefix $(archdir)/, $(if $(HEADLESS),,License-*.html) LICENSE)
+            $(addprefix $(archdir)/, LICENSE)
         rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.chm \
-            LICENSE $(if $(HEADLESS),,License-*.html))
+            LICENSE)
         for i in rdesktop-vrdp.tar.gz additions/VBoxGuestAdditions.iso; do \
             mv $(archdir)/$$i $(prefix)/usr/share/$(package); done

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -425 +425 @@
 %defattr(-,root,root)
 %doc LICENSE
-%doc %LICENSE%
 %doc UserManual*.pdf
 %doc VirtualBox*.chm

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

@@ -166 +166 @@
           -e 's|%BUILDROOT%|$(current)/rpm/buildroot|g' \
           -e 's|%LIB%|$(rpmlib)|g' \
-          -e 's|%LICENSE%|$(notdir $(wildcard $(builddir)/bin/License-*.html))|g' \
           -e 's|%SPEC%|$(rpmspec)|g' \
           -e 's|%MACROSPYTHON%|$(if $(wildcard /usr/lib/rpm/macros.python),%include /usr/lib/rpm/macros.python,)|g' \