Changeset 63953 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Sep 22, 2016 2:44:31 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

110839

Message:

rpm: python fix

Location:

trunk/src/VBox/Installer/linux/rpm

Files:

• VirtualBox.tmpl.spec (modified) (4 diffs)
• rules (modified) (1 diff)

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

@@ -17 +17 @@
 %define %SPEC% 1
 %define %OSE% 1
+%define %PYTHON 1
 %define VBOXDOCDIR %{_defaultdocdir}/%NAME%
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
@@ -36 +37 @@
 %endif
 
+%if %{?with_python:1}%{!?with_python:0}
 %MACROSPYTHON%
+%endif
 
 # our Qt5 libs are built on EL5 with ld 2.17 which does not provide --link-id=
@@ -77 +80 @@
 install -m 755 -d $RPM_BUILD_ROOT/usr/share/virtualbox
 install -m 755 -d $RPM_BUILD_ROOT/usr/share/mime/packages
+%if %{?with_python:1}%{!?with_python:0}
 (export VBOX_INSTALL_PATH=/usr/lib/virtualbox && \
   cd ./sdk/installer && \
   %{__python} ./vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT)
+%endif
 rm -rf sdk/installer
 mv nls $RPM_BUILD_ROOT/usr/share/virtualbox
@@ -303 +308 @@
 %defattr(-,root,root)
 %doc %{VBOXDOCDIR}/*
+%if %{?with_python:1}%{!?with_python:0}
 %{?rpm_suse: %{py_sitedir}/*}
 %{!?rpm_suse: %{python_sitelib}/*}
+%endif
 /etc/vbox
 /usr/bin/*

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

@@ -223 +223 @@
             -e 's|%OSE%|$(if $(ose),is_ose,not_ose)|g' \
             -e 's|%SPEC%|$(rpmspec)|g' \
+            -e 's|%PYTHON|$(if $(filter el5,$(rpmrel)),,with_python)|g' \ 
             -e 's|%MACROSPYTHON%|$(if $(wildcard /usr/lib/rpm/macros.python),%include /usr/lib/rpm/macros.python,)|g' \
             -e 's|%INSTMOD%|$(instmod)|g' \