Changeset 40545 in vbox for trunk

Timestamp:

Mar 19, 2012 8:29:51 PM (13 years ago)

Author:

vboxsync

Message:

rpm: more OSE fixes

Location:

trunk/src/VBox/Installer/linux/rpm

Files:

• VirtualBox.tmpl.spec (modified) (4 diffs)
• rules (modified) (2 diffs)

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

@@ -16 +16 @@
 
 %define %SPEC% 1
+%define %OSE% 1
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
@@ -110 +111 @@
 rmdir icons
 mv virtualbox.xml $RPM_BUILD_ROOT/usr/share/mime/packages
-for i in VBoxManage VBoxSVC VBoxSDL VirtualBox VBoxHeadless VBoxExtPackHelperApp VBoxBalloonCtrl vboxwebsrv webtest; do
+for i in VBoxManage VBoxSVC VBoxSDL VirtualBox VBoxHeadless VBoxExtPackHelperApp VBoxBalloonCtrl; do
   mv $i $RPM_BUILD_ROOT/usr/lib/virtualbox; done
+if %WEBSVC%; then
+  for i in vboxwebsrv webtest; do
+    mv $i $RPM_BUILD_ROOT/usr/lib/virtualbox; done
+fi
 for i in VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl; do
   chmod 4511 $RPM_BUILD_ROOT/usr/lib/virtualbox/$i; done
@@ -143 +148 @@
   fi
 done
-mv kchmviewer $RPM_BUILD_ROOT/usr/lib/virtualbox
-for i in rdesktop-vrdp.tar.gz rdesktop-vrdp-keymaps additions/VBoxGuestAdditions.iso; do
+%if %{?is_ose:0}%{!?is_ose:1}
+  mv kchmviewer $RPM_BUILD_ROOT/usr/lib/virtualbox
+  for i in rdesktop-vrdp.tar.gz rdesktop-vrdp-keymaps; do
+    mv $i $RPM_BUILD_ROOT/usr/share/virtualbox; done
+  mv rdesktop-vrdp $RPM_BUILD_ROOT/usr/bin
+%endif
+for i in additions/VBoxGuestAdditions.iso; do
   mv $i $RPM_BUILD_ROOT/usr/share/virtualbox; done
 if [ -d accessible ]; then
   mv accessible $RPM_BUILD_ROOT/usr/lib/virtualbox
 fi
-mv rdesktop-vrdp $RPM_BUILD_ROOT/usr/bin
 install -D -m 755 vboxdrv.init $RPM_BUILD_ROOT%{_initrddir}/vboxdrv
 %if %{?rpm_suse:1}%{!?rpm_suse:0}
@@ -406 +415 @@
 %files
 %defattr(-,root,root)
-%doc LICENSE
-%doc UserManual*.pdf
-%doc VirtualBox*.chm
+%{!?is_ose: LICENSE}
+%{!?is_ose: UserManual*.pdf}
+%{!?is_ose: VirtualBox*.chm}
 %{_initrddir}/vboxdrv
 %{_initrddir}/vboxballoonctrl-service

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

@@ -206 +206 @@
           -e 's|%BUILDROOT%|$(current)/rpm/buildroot|g' \
           -e 's|%LIB%|$(rpmlib)|g' \
+          -e 's|%OSE%|$(if $(ose),is_ose,not_ose)|g' \
           -e 's|%SPEC%|$(rpmspec)|g' \
           -e 's|%MACROSPYTHON%|$(if $(wildcard /usr/lib/rpm/macros.python),%include /usr/lib/rpm/macros.python,)|g' \
@@ -211 +212 @@
           -e 's|%LIBASOUND%|$(if $(filter lib64,$(rpmlib)),libasound.so.2()(64bit),libasound.so.2)|g' \
           -e 's|%INITSCRIPTS%|$(if $(filter fedora,$(rpmspec)),initscripts,)|g' \
+          -e "s|%WEBSVC%|$(if $(NOWEBSVC),false,true)|g" \
           -e '/#include installer-common.sh/ {' \
           -e "r $(vboxroot)/src/VBox/Installer/linux/installer-common.sh" \