commit ce061de62bd840b466902ea312883e53f3c05a35
Author: Elan Ruusamäe <[email protected]>
Date: Sat Mar 1 22:31:11 2014 +0200
drop vboxadd, vboxadd-service, vboxadd-x11 - we have their logic covered
VirtualBox.spec | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 39bbd28..2199d65 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -661,11 +661,13 @@ install -p %{SOURCE5} $RPM_BUILD_ROOT/sbin/mount.vdi
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/autorun.sh
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/runasroot.sh
-# unknown - checkme
-%if 1
+# scripts to setup modules, x11 and service. we have covered that in our
packages
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxadd
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxadd-service
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxadd-x11
+
+# unknown - checkme
+%if 1
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/helpers/generate_service_file
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPInstall
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPLoggerCtl
@@ -984,12 +986,6 @@ dkms remove -m vboxhost -v %{version}-%{rel}
--rpm_safe_upgrade --all || :
%attr(755,root,root) %{_bindir}/VBoxClient
%attr(755,root,root) %{_bindir}/VBoxClient-all
-%if 0
-%attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd
-%attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd-service
-%attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd-x11
-%endif
-
%if %{with webservice}
%files webservice
%defattr(644,root,root,755)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/ce061de62bd840b466902ea312883e53f3c05a35
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
