packages: VirtualBox/VirtualBox.spec - fix install - add systemd R - reload...

[baggins]

Author: baggins                      Date: Tue Feb 14 18:48:53 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix install
- add systemd R
- reload systemd in post for kernel modules

---- Files affected:
packages/VirtualBox:
   VirtualBox.spec (1.416 -> 1.417) 

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.416 packages/VirtualBox/VirtualBox.spec:1.417
--- packages/VirtualBox/VirtualBox.spec:1.416	Tue Feb 14 19:32:47 2012
+++ packages/VirtualBox/VirtualBox.spec	Tue Feb 14 19:48:48 2012
@@ -125,6 +125,7 @@
 BuildRequires:	python-modules
 BuildRequires:	qt4-build >= 4.2.0
 BuildRequires:	qt4-linguist
+BuildRequires:	rpmbuild(macros) >= 1.627
 BuildRequires:	sed >= 4.0
 %if %{with doc}
 BuildRequires:	texlive-fonts-bitstream
@@ -314,6 +315,7 @@
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
+Requires:	systemd-units >= 37-0.10
 Provides:	kernel(vboxguest) = %{version}-%{rel}
 Obsoletes:	kernel%{_alt_kernel}-misc-vboxadd
 Conflicts:	kernel%{_alt_kernel}-misc-vboxdrv
@@ -338,6 +340,7 @@
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
+Requires:	systemd-units >= 37-0.10
 Provides:	kernel(vboxdrv) = %{version}-%{rel}
 
 %description -n kernel%{_alt_kernel}-misc-vboxdrv
@@ -361,6 +364,7 @@
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
+Requires:	systemd-units >= 37-0.10
 Provides:	kernel(vboxnetflt) = %{version}-%{rel}
 
 %description -n kernel%{_alt_kernel}-misc-vboxnetadp
@@ -384,6 +388,7 @@
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
+Requires:	systemd-units >= 37-0.10
 Provides:	kernel(vboxnetflt) = %{version}-%{rel}
 
 %description -n kernel%{_alt_kernel}-misc-vboxnetflt
@@ -407,6 +412,7 @@
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
+Requires:	systemd-units >= 37-0.10
 Provides:	kernel(vboxpci) = %{version}-%{rel}
 
 %description -n kernel%{_alt_kernel}-misc-vboxpci
@@ -431,6 +437,7 @@
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
+Requires:	systemd-units >= 37-0.10
 Provides:	kernel(vboxsf) = %{version}-%{rel}
 Obsoletes:	kernel%{_alt_kernel}-misc-vboxvfs
 
@@ -612,7 +619,7 @@
 %endif
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,modprobe.d},%{_sbindir}}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,modules-load.d},%{_sbindir},%{systemdunitdir}}
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxdrv
 install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxguest
 install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetflt
@@ -680,6 +687,7 @@
 %depmod %{_kernel_ver}
 /sbin/chkconfig --add vboxguest
 %service vboxguest restart "VirtualBox Guest additions driver"
+%systemd_reload
 
 %postun	-n kernel%{_alt_kernel}-misc-vboxguest
 %depmod %{_kernel_ver}
@@ -694,6 +702,7 @@
 %depmod %{_kernel_ver}
 /sbin/chkconfig --add vboxdrv
 %service vboxdrv restart "VirtualBox Support Driver"
+%systemd_reload
 
 %postun	-n kernel%{_alt_kernel}-misc-vboxdrv
 %depmod %{_kernel_ver}
@@ -708,6 +717,7 @@
 %depmod %{_kernel_ver}
 /sbin/chkconfig --add vboxnetadp
 %service vboxnetadp restart "VirtualBox Network HostOnly driver"
+%systemd_reload
 
 %postun	-n kernel%{_alt_kernel}-misc-vboxnetadp
 %depmod %{_kernel_ver}
@@ -722,6 +732,7 @@
 %depmod %{_kernel_ver}
 /sbin/chkconfig --add vboxnetflt
 %service vboxnetflt restart "VirtualBox Network Filter driver"
+%systemd_reload
 
 %postun	-n kernel%{_alt_kernel}-misc-vboxnetflt
 %depmod %{_kernel_ver}
@@ -736,6 +747,7 @@
 %depmod %{_kernel_ver}
 /sbin/chkconfig --add vboxpci
 %service vboxnetflt restart "VirtualBox PCI passthrough driver"
+%systemd_reload
 
 %postun	-n kernel%{_alt_kernel}-misc-vboxpci
 %depmod %{_kernel_ver}
@@ -750,6 +762,7 @@
 %depmod %{_kernel_ver}
 /sbin/chkconfig --add vboxsf
 %service vboxsf restart "VirtualBox Host file system access (Shared Folders)"
+%systemd_reload
 
 %postun	-n kernel%{_alt_kernel}-misc-vboxsf
 %depmod %{_kernel_ver}
@@ -984,6 +997,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.417  2012/02/14 18:48:48  baggins
+- fix install
+- add systemd R
+- reload systemd in post for kernel modules
+
 Revision 1.416  2012/02/14 18:32:47  baggins
 - systemd support in the form of kernel loader configs,
   and masked kernel-loading services - let systemd handle it
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.416&r2=1.417&f=u