Changeset 68128 in vbox

Timestamp:

Jul 26, 2017 4:08:13 PM (8 years ago)

Author:

vboxsync

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

117202

Message:

deb/rpm: bugref:8931: re-enable python multiversion support ignoring the dependencies to the actual python package in VBoxPython*.so

Location:

trunk/src/VBox/Installer/linux

Files:

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

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

@@ -111 +111 @@
              VBOX_WITH_VMSVGA3D=1 \
              VBOX_DO_STRIP= \
-             VBOX_WITH_MULTIVERSION_PYTHON= \
              VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/$(verpkg)\"" \
              $(if $(ose),,VBOX_WITH_DOCS_CHM=1) \
@@ -330 +329 @@
         dh_perl
         # for some reason, the Qt libraries couldn't be found on newer releases (e.g. Ubuntu hardy)
-        LD_LIBRARY_PATH=$(prefix)/usr/lib/virtualbox dh_shlibdeps
+        LD_LIBRARY_PATH=$(prefix)/usr/lib/virtualbox dh_shlibdeps --exclude=VBoxPython
         dh_gencontrol -- \
           -Valsa=$(if $(HEADLESS),,libasound2) \

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

@@ -19 +19 @@
 %define %PYTHON% 1
 %define VBOXDOCDIR %{_defaultdocdir}/%NAME%
+%global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 

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

@@ -168 +168 @@
              $(if $(filter el5,$(rpmrel)),VBOX_BLD_PYTHON=$(strip \
                 $(firstword $(wildcard /usr/local/bin/python2.7) $(wildcard /usr/bin/python))),) \
-             VBOX_WITH_MULTIVERSION_PYTHON= \
              $(doc_dir) \
              $(if $(ose),,VBOX_WITH_DOCS_CHM=1) \