From ce093b81f0c2d49c091f978c98dfef2133eae40c331dde85ac7a1190d6afbe87 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 11 May 2021 18:15:49 +0000 Subject: [PATCH 1/3] Accepting request 892130 from home:dirkmueller:Factory - fix license packaging, small cruft cleanup (avoid owning directories provided by filesystem rpm) OBS-URL: https://build.opensuse.org/request/show/892130 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=603 --- virtualbox.changes | 5 +++++ virtualbox.spec | 25 ++++++++++--------------- 2 files changed, 15 insertions(+), 15 deletions(-) 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 From a38d5eddf268ce685dbc509c9610f571e93c92d5ced831560f4f701ec3b170bb Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 12 May 2021 17:36:32 +0000 Subject: [PATCH 2/3] Accepting request 892439 from home:dancermak:branches:Virtualization Require which for /usr/lib/virtualbox/vboxadd-service OBS-URL: https://build.opensuse.org/request/show/892439 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=604 --- virtualbox.changes | 5 +++++ virtualbox.spec | 22 ++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/virtualbox.changes b/virtualbox.changes index dc3b7f9..66dda59 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 12 09:38:28 UTC 2021 - Dan Čermák + +- Require which for /usr/lib/virtualbox/vboxadd-service + ------------------------------------------------------------------- Mon May 10 21:16:28 UTC 2021 - Dirk Müller diff --git a/virtualbox.spec b/virtualbox.spec index 164cfba..f8dcd8f 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -1,5 +1,5 @@ # -# spec file for package virtualbox%{?dash}%{?name_suffix} +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -330,8 +330,8 @@ the terms of the GNU Public License (GPL). -########################################## +########################################## %package qt Summary: Qt GUI part for %{name} Group: System/Emulators/PC @@ -368,8 +368,8 @@ This package contains the code for the GUI used to control VMs. -######################################### +######################################### %package websrv Summary: WebService GUI part for %{name} Group: System/Emulators/PC @@ -400,8 +400,8 @@ The VirtualBox web server is used to control headless VMs using a browser. -######################################### +######################################### %package guest-x11 Summary: VirtualBox X11 drivers for mouse and video Group: System/X11/Servers/XF86_4 @@ -434,8 +434,8 @@ This package contains X11 guest utilities and X11 guest mouse and video drivers -########################################### +########################################### %package guest-tools Summary: VirtualBox guest tools Group: System/Emulators/PC @@ -447,6 +447,8 @@ Obsoletes: %{name}-ose-guest-tools < %{version} %if ! 0%{?suse_version} > 1325 Requires(pre): net-tools-deprecated %endif +# for /usr/lib/virtualbox/vboxadd-service +Requires: which %description guest-tools VirtualBox guest addition tools. @@ -471,8 +473,8 @@ VirtualBox guest addition tools. -########################################### +########################################### %package -n python3-%{name} Summary: Python bindings for %{name} Group: Development/Libraries/Python @@ -510,8 +512,8 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package. -########################################### +########################################### %package devel Summary: Devel files for %{name} Group: Development/Libraries/Other @@ -544,8 +546,8 @@ Development file for %{name} -########################################### +########################################### %package host-source Summary: Source files for %{name} host kernel modules Group: Development/Sources @@ -580,8 +582,8 @@ sudo /sbin/vboxguestconfig -########################################### +########################################### %package guest-desktop-icons Summary: Icons for guest desktop files Group: System/Emulators/PC @@ -612,8 +614,8 @@ This package contains icons for guest desktop files that were created on the des -########################################### +########################################### %package vnc Summary: VNC desktop sharing Group: System/Emulators/PC From 0e1ee06ea517edb4b01b90fb334f994b75aa4f6f8f5080d966641305aedc8db8 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 14 May 2021 18:05:55 +0000 Subject: [PATCH 3/3] Accepting request 893086 from home:dancermak:branches:Virtualization Correct WantedBy entry in vboxadd-service OBS-URL: https://build.opensuse.org/request/show/893086 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=605 --- vboxadd-service.service | 3 +-- virtualbox.changes | 5 +++++ virtualbox.spec | 9 +++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/vboxadd-service.service b/vboxadd-service.service index 72faea7..2dbd5e9 100644 --- a/vboxadd-service.service +++ b/vboxadd-service.service @@ -17,5 +17,4 @@ ExecStart=/usr/lib/virtualbox/vboxadd-service start ExecStop=/usr/lib/virtualbox/vboxadd-service stop [Install] -WantedBy=multi-user.target.wants - +WantedBy=multi-user.target diff --git a/virtualbox.changes b/virtualbox.changes index 66dda59..4cbdf68 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 14 10:35:52 UTC 2021 - Dan Čermák + +- Correct WantedBy entry in vboxadd-service + ------------------------------------------------------------------- Wed May 12 09:38:28 UTC 2021 - Dan Čermák diff --git a/virtualbox.spec b/virtualbox.spec index f8dcd8f..33aef89 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -332,6 +332,7 @@ the terms of the GNU Public License (GPL). ########################################## + %package qt Summary: Qt GUI part for %{name} Group: System/Emulators/PC @@ -370,6 +371,7 @@ This package contains the code for the GUI used to control VMs. ######################################### + %package websrv Summary: WebService GUI part for %{name} Group: System/Emulators/PC @@ -402,6 +404,7 @@ The VirtualBox web server is used to control headless VMs using a browser. ######################################### + %package guest-x11 Summary: VirtualBox X11 drivers for mouse and video Group: System/X11/Servers/XF86_4 @@ -436,6 +439,7 @@ This package contains X11 guest utilities and X11 guest mouse and video drivers ########################################### + %package guest-tools Summary: VirtualBox guest tools Group: System/Emulators/PC @@ -475,6 +479,7 @@ VirtualBox guest addition tools. ########################################### + %package -n python3-%{name} Summary: Python bindings for %{name} Group: Development/Libraries/Python @@ -514,6 +519,7 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package. ########################################### + %package devel Summary: Devel files for %{name} Group: Development/Libraries/Other @@ -548,6 +554,7 @@ Development file for %{name} ########################################### + %package host-source Summary: Source files for %{name} host kernel modules Group: Development/Sources @@ -584,6 +591,7 @@ sudo /sbin/vboxguestconfig ########################################### + %package guest-desktop-icons Summary: Icons for guest desktop files Group: System/Emulators/PC @@ -616,6 +624,7 @@ This package contains icons for guest desktop files that were created on the des ########################################### + %package vnc Summary: VNC desktop sharing Group: System/Emulators/PC