diff --git a/virtualbox.changes b/virtualbox.changes index 829196d..dc3b7f9 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 10 21:16:28 UTC 2021 - Dirk Müller + +- fix license packaging, small cruft cleanup (avoid owning directories provided by filesystem rpm) + ------------------------------------------------------------------- Fri Apr 30 18:38:18 UTC 2021 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 83234b8..164cfba 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -298,8 +298,6 @@ Obsoletes: virtualbox-guest-kmp Obsoletes: virtualbox-host-kmp # end of kmp_package %endif - -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: x86_64 ### Description and subpackages of virtualbox main package ### @@ -330,6 +328,7 @@ the terms of the GNU Public License (GPL). + ########################################## @@ -367,6 +366,7 @@ This package contains the code for the GUI used to control VMs. + ######################################### @@ -398,6 +398,7 @@ The VirtualBox web server is used to control headless VMs using a browser. + ######################################### @@ -431,6 +432,7 @@ This package contains X11 guest utilities and X11 guest mouse and video drivers + ########################################### @@ -467,6 +469,7 @@ VirtualBox guest addition tools. + ########################################### @@ -505,6 +508,7 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package. + ########################################### @@ -538,6 +542,7 @@ Development file for %{name} + ########################################### @@ -574,6 +579,7 @@ sudo /sbin/vboxguestconfig + ########################################### %package guest-desktop-icons @@ -604,6 +610,7 @@ This package contains icons for guest desktop files that were created on the des + ########################################### @@ -805,7 +812,6 @@ pushd out/linux.*/release/packages/ mkdir -p "%{buildroot}%{_datadir}/virtualbox/extensions/" install -D -m 644 VNC-*.vbox-extpack "%{buildroot}%{_datadir}/virtualbox/extensions/VNC-%{version}.vbox-extpack" popd -install -D -m 644 "COPYING" "%{buildroot}%{_datadir}/licenses/LICENSE.vnc" # ############################################################## @@ -1106,7 +1112,6 @@ export DISABLE_RESTART_ON_UPDATE=yes ####################################################### %files -%defattr(-, root, root) %doc README.autostart UserManual.pdf README.build %{_bindir}/VBoxManage %{_bindir}/VBoxHeadless @@ -1178,7 +1183,6 @@ export DISABLE_RESTART_ON_UPDATE=yes %config %attr(644,root,vboxusers) %{_sysconfdir}/vbox/autostart.cfg %files qt -%defattr(-, root, root) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxPermissionMessage %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSUIDMessage %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxUSB_DevRules @@ -1210,7 +1214,6 @@ export DISABLE_RESTART_ON_UPDATE=yes %{_udevrulesdir}/60-vboxdrv.rules %files guest-x11 -%defattr(-, root, root) %dir %{_libdir}/xorg/modules/drivers %dir %{_libdir}/xorg/modules/input %dir %{_libdir}/dri/ @@ -1218,7 +1221,6 @@ export DISABLE_RESTART_ON_UPDATE=yes %{_distconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh %files guest-tools -%defattr(-, root, root) %{_bindir}/VBoxControl %{_sbindir}/VBoxService /sbin/vboxguestconfig @@ -1232,7 +1234,6 @@ export DISABLE_RESTART_ON_UPDATE=yes %endif %files -n python3-%{name} -%defattr(-, root, root) %dir %{_vbox_instdir}/sdk %dir %{_vbox_instdir}/sdk/bindings %dir %{_vbox_instdir}/sdk/bindings/xpcom @@ -1242,7 +1243,6 @@ export DISABLE_RESTART_ON_UPDATE=yes %{python3_sitelib}/vboxapi/ %files devel -%defattr(-,root, root) %dir %{_vbox_instdir}/sdk %dir %{_vbox_instdir}/sdk/bindings %dir %{_vbox_instdir}/sdk/bindings/xpcom @@ -1253,12 +1253,10 @@ export DISABLE_RESTART_ON_UPDATE=yes %{_vbox_instdir}/sdk/bindings/auth %files host-source -%defattr(-,root, root) %dir %{_usrsrc}/kernel-modules %{_usrsrc}/kernel-modules/virtualbox %files guest-source -%defattr(-,root, root) %dir %{_usrsrc}/kernel-modules %dir %{_usrsrc}/kernel-modules/additions %{_usrsrc}/kernel-modules/additions/guest_src.tar.bz2 @@ -1271,16 +1269,13 @@ export DISABLE_RESTART_ON_UPDATE=yes %{_vbox_instdir}/vboxwebsrv %files guest-desktop-icons -%defattr(-,root, root) %dir %{_datadir}/pixmaps/virtualbox %{_datadir}/pixmaps/virtualbox/*.png %files vnc -%defattr(-,root, root) +%license COPYING %dir %{_datadir}/virtualbox/extensions %{_datadir}/virtualbox/extensions/VNC-%{version}.vbox-extpack -%dir %{_datadir}/licenses -%{_datadir}/licenses/LICENSE.vnc # main_package %endif