commit 244b344b66bfaa05d8e584f30085b169b470fc0c Author: Jan Palus <at...@pld-linux.org> Date: Tue Aug 2 21:30:38 2016 +0200
make additions noarch again; rel 2 userspace checks both %{_datadir} and %{_libdir}/additions VirtualBox.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- diff --git a/VirtualBox.spec b/VirtualBox.spec index 2e80126..e89f9c3 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -42,7 +42,7 @@ exit 1 %define qtver 5.3.2 -%define rel 1 +%define rel 2 %define pname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 @@ -637,9 +637,11 @@ if cp -al COPYING $RPM_BUILD_ROOT/COPYING; then %{__rm} $RPM_BUILD_ROOT/COPYING fi +install -d $RPM_BUILD_ROOT%{_datadir}/%{pname} + cp -a$l %{outdir}/* $RPM_BUILD_ROOT%{_libdir}/%{pname} -cp -p$l %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso || -cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso +cp -p$l %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso || +cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso %if %{without gui} %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons @@ -730,7 +732,6 @@ cp -p $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons/128x128/virtualbox.png $RPM_BUILD mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/virtualbox.desktop $RPM_BUILD_ROOT%{_desktopdir}/virtualbox.desktop mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/virtualbox.xml -install -d $RPM_BUILD_ROOT%{_datadir}/%{pname} mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/nls $RPM_BUILD_ROOT%{_datadir}/%{pname} ( @@ -1067,8 +1068,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %files additions %defattr(644,root,root,755) -%dir %{_libdir}/%{pname}/additions -%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso +%{_datadir}/%{pname}/VBoxGuestAdditions.iso %files guest %defattr(644,root,root,755) ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/244b344b66bfaa05d8e584f30085b169b470fc0c _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit