diff --git a/virtualbox.changes b/virtualbox.changes index bb4eb11..78c9298 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 6 08:47:25 UTC 2018 - Dominique Leuenberger + +- Fix / simplify python3-virtualbox packages files section. Do not + rely on --record-rpm for any version of python, since we can't + use it across the band. + ------------------------------------------------------------------- Mon Nov 5 22:14:57 UTC 2018 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index dfd665a..02c9ef9 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -709,11 +709,7 @@ install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh %{buildroot}%{_ echo "entering python-virtualbox install section" ###################################################### pushd out/linux.*/release/bin/sdk/installer -%if %python3_version_nodots == 36 -VBOX_INSTALL_PATH=%{_vbox_instdir} python3 vboxapisetup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=%{_tmppath}/SITE_FILES -%else VBOX_INSTALL_PATH=%{_vbox_instdir} python3 vboxapisetup.py install --prefix=%{_prefix} --root=%{buildroot} -%endif popd install -d -m 755 %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom cp -r out/linux.*/release/bin/sdk/bindings/xpcom/python %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom @@ -982,33 +978,15 @@ export DISABLE_RESTART_ON_UPDATE=yes %dir /media %endif -%if %python3_version_nodots == 36 -%files -n python3-%{name} -f %{_tmppath}/SITE_FILES -%endif +%files -n python3-%{name} %defattr(-, root, root) %dir %{_vbox_instdir}/sdk %dir %{_vbox_instdir}/sdk/bindings %dir %{_vbox_instdir}/sdk/bindings/xpcom %{_vbox_instdir}/sdk/bindings/xpcom/python -# -# With Python 3.6 and earlier, vboxapisetup.py would save the names of the files -# that it created to a temporary file and use that file to create a list. With -# Python 3.7, this file is no longer created, thus the code is switched to handling -# those directories and files manually. The python3_version_nodots macro is used to -# detect the version. -# -%if %python3_version_nodots == 36 -%attr(0755, root, root) %{_vbox_instdir}/VBoxPython3_6m.so -%else -%attr(0755, root, root) %{_vbox_instdir}/VBoxPython3_7m.so -%dir %{python3_sitelib}/vboxapi -%dir %{python3_sitelib}/vboxapi/__pycache__ -%attr(0755, root, root) %{python3_sitelib}/vboxapi-1.0-py3.7.egg-info -%attr(0755, root, root) %{python3_sitelib}/vboxapi/VirtualBox_constants.py -%attr(0755, root, root) %{python3_sitelib}/vboxapi/__init__.py -%attr(0755, root, root) %{python3_sitelib}/vboxapi/__pycache__/VirtualBox_constants.cpython-37.pyc -%attr(0755, root, root) %{python3_sitelib}/vboxapi/__pycache__/__init__.cpython-37.pyc -%endif +%{_vbox_instdir}/VBoxPython*.so +%{python3_sitelib}/vboxapi-1.0-*.egg-info +%{python3_sitelib}/vboxapi/ %files devel %defattr(-,root, root)