1
0
forked from jengelh/virtualbox

Accepting request 922840 from home:frispete:kernel

Larry,

no idea, what these white space changes are about, but found them in your 
spec as well, so I guess, some run-away spec-cleaner is in effect.. :-(

This is the correct fix now, and the reason for not detecting it befor is
burried in the Virtualization project config:

%if "%_repository" == "openSUSE_Factory"
# rpmlint results (in the rare case they have any meaning) are only relevant for Factory
%else
Substitute: clamav bash
Substitute: clamav-database bash
Substitute: post-build-checks bash
Substitute: post-build-checks-malwarescan bash
Substitute: rpmlint-Factory bash
Substitute: rpmlint-Factory-strict bash
Substitute: rpmlint-backports bash
Substitute: rpmlint-backports-data bash
Substitute: rpmlint-mini bash
%endif

Of course, there's no openSUSE_Factory target!

Best,
Pete

- Remove vbox-fix-usb-rules.sh from qt package to avoid file conflict

OBS-URL: https://build.opensuse.org/request/show/922840
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=618
This commit is contained in:
Larry Finger 2021-10-03 15:43:40 +00:00 committed by Git OBS Bridge
parent 86ff591aaa
commit 822fcfac17
2 changed files with 25 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Oct 2 22:59:48 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net>
- Remove vbox-fix-usb-rules.sh from qt package to avoid file conflict
-------------------------------------------------------------------
Sat Oct 2 16:55:07 UTC 2021 - Larry Finger <Larry.Finger@gmail.com>

View File

@ -318,7 +318,9 @@ the terms of the GNU Public License (GPL).
##########################################
%package qt
Summary: Qt GUI part for %{name}
Group: System/Emulators/PC
@ -352,7 +354,9 @@ This package contains the code for the GUI used to control VMs.
#########################################
%package websrv
Summary: WebService GUI part for %{name}
Group: System/Emulators/PC
@ -380,7 +384,9 @@ 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
@ -410,7 +416,9 @@ This package contains X11 guest utilities and X11 guest mouse and video drivers
###########################################
%package guest-tools
Summary: VirtualBox guest tools
Group: System/Emulators/PC
@ -445,7 +453,9 @@ VirtualBox guest addition tools.
###########################################
%package -n python3-%{name}
Summary: Python bindings for %{name}
Group: Development/Libraries/Python
@ -480,7 +490,9 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package.
###########################################
%package devel
Summary: Devel files for %{name}
Group: Development/Libraries/Other
@ -510,7 +522,9 @@ Development file for %{name}
###########################################
%package host-source
Summary: Source files for %{name} host kernel modules
Group: Development/Sources
@ -557,7 +571,9 @@ sudo /usr/sbin/vboxguestconfig
###########################################
%package guest-desktop-icons
Summary: Icons for guest desktop files
Group: System/Emulators/PC
@ -585,7 +601,9 @@ This package contains icons for guest desktop files that were created on the des
###########################################
%package vnc
Summary: VNC desktop sharing
Group: System/Emulators/PC
@ -1152,7 +1170,8 @@ export DISABLE_RESTART_ON_UPDATE=yes
%{_sbindir}/rcvboxdrv
%{_sbindir}/rcvboxautostart
/usr/sbin/vboxconfig
/usr/sbin/vbox-fix-usb-rules.sh
#rules fixing script is in /usr/sbin
%attr(0755,root,root) /usr/sbin/vbox-fix-usb-rules.sh
%{_vbox_instdir}/VBoxCreateUSBNode.sh
%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetNAT
%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP
@ -1176,8 +1195,6 @@ export DISABLE_RESTART_ON_UPDATE=yes
#wrapper script is in bindir
%attr(0755,root,root) %{_bindir}/VirtualBox
%attr(0755,root,root) %{_bindir}/update-extpack.sh
#rules fixing script is in /usr/sbin
%attr(0755,root,root) /usr/sbin/vbox-fix-usb-rules.sh
#ldd shows libQt* dependency
%{_vbox_instdir}/VBoxTestOGL
#qm's translations