pool/virtualbox
SHA256
3
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 854196 from home:dimstar:Factory

Browse Source 
- Fix build with RPM 4.16: Do not install files to buildroot during
  the build phase:
- Do not forcibly require systemd: systemd_ordering is sufficient.

  For that reason, a workaround is added.

OBS-URL: https://build.opensuse.org/request/show/854196
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=576
This commit is contained in:
Larry Finger 2020-12-09 15:52:37 +00:00 committed by Git OBS Bridge
parent af28aadc8c
commit ed6e7df33d
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
virtualbox.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Dec 8 13:41:09 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Fix build with RPM 4.16: Do not install files to buildroot during
the build phase:
- Do not forcibly require systemd: systemd_ordering is sufficient.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 18 16:36:31 UTC 2020 - Larry Finger <Larry.Finger@gmail.com> Fri Sep 18 16:36:31 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>

17
virtualbox.spec
View File

@ -266,7 +266,7 @@ BuildRequires: xorg-x11-libXext-devel-32bit
BuildRequires: xorg-x11-libXmu-devel-32bit BuildRequires: xorg-x11-libXmu-devel-32bit
BuildRequires: xorg-x11-libXt-devel-32bit BuildRequires: xorg-x11-libXt-devel-32bit
%endif %endif
%{?systemd_requires} %{?systemd_ordering}
# package i4l-vbox from source package i4l-base shares the directory /etc/vbox # package i4l-vbox from source package i4l-base shares the directory /etc/vbox
# with us, but with different owner. # with us, but with different owner.
Conflicts: i4l-vbox Conflicts: i4l-vbox
@ -585,11 +585,6 @@ echo "build VNC extension pack"
# tar must use GNU, not POSIX, format here # tar must use GNU, not POSIX, format here
sed -i 's/tar /tar --format=gnu /' src/VBox/ExtPacks/VNC/Makefile.kmk sed -i 's/tar /tar --format=gnu /' src/VBox/ExtPacks/VNC/Makefile.kmk
kmk -C src/VBox/ExtPacks/VNC packing kmk -C src/VBox/ExtPacks/VNC packing
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"
%install %install
################################# #################################
@ -628,6 +623,16 @@ install -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules
%if 0%{?suse_version} > 1320 || 0%{?sle_version} == 120300 %if 0%{?suse_version} > 1320 || 0%{?sle_version} == 120300
install -d -m 755 %{buildroot}/media install -d -m 755 %{buildroot}/media
%endif %endif
###########################################
echo "entering VNC extension install section"
###########################################
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"
# #
############################################################## ##############################################################
echo "entering guest-x11 install section" echo "entering guest-x11 install section"