SPECS: VirtualBox.spec - added init script and udev rule to create /dev/vbo...

[hawk]

Author: hawk                         Date: Fri May 16 13:24:32 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added init script and udev rule to create /dev/vboxadd on guest systems,
  moved init scripts from userspace to kernel packages, w/o them they're
  useless anyway and cause guests to require whole VirtualBox instead of
  just kernel modules
- relase 2.1 because 'cvs mv VirtualBox.init,v VirtualBox-vboxdrv.init,v'
  is needed

---- Files affected:
SPECS:
   VirtualBox.spec (1.83 -> 1.84) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.83 SPECS/VirtualBox.spec:1.84
--- SPECS/VirtualBox.spec:1.83	Tue May 13 13:48:19 2008
+++ SPECS/VirtualBox.spec	Fri May 16 15:24:26 2008
@@ -12,7 +12,7 @@
 %bcond_without	kernel		# don't build kernel module
 %bcond_without	userspace	# don't build userspace package
 
-%define		rel		2
+%define		rel		2.1
 
 %if %{without kernel}
 %undefine	with_dist_kernel
@@ -39,9 +39,10 @@
 # Source1-md5:	e21694fd087b42173bca3fc9af068f22
 Source2:	http://www.virtualbox.org/download/%{version}/VBoxGuestAdditions_%{version}.iso
 # Source2-md5:	e90b718aa806845194fd411e3dbf78ff
-Source3:	%{pname}.init
-Source4:	%{pname}.desktop
-Source5:	%{pname}.sh
+Source3:	%{pname}-vboxdrv.init
+Source4:	%{pname}-vboxadd.init
+Source5:	%{pname}.desktop
+Source6:	%{pname}.sh
 Patch0:		%{pname}-configure.patch
 Patch1:		%{pname}-qt-paths.patch
 Patch2:		%{pname}-shared-libstdc++.patch
@@ -257,6 +258,7 @@
 
 cat <<'EOF' > udev.conf
 KERNEL=="vboxdrv", NAME="%k", GROUP="vbox", MODE="0660"
+KERNEL=="vboxadd", NAME="%k", GROUP="vbox", MODE="0660"
 EOF
 
 install %{SOURCE1} .
@@ -297,12 +299,9 @@
 %if %{with userspace}
 install -d \
 	$RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_desktopdir}} \
-	$RPM_BUILD_ROOT%{_libdir}/VirtualBox \
-	$RPM_BUILD_ROOT/etc/rc.d/init.d
-
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtualbox
+	$RPM_BUILD_ROOT%{_libdir}/VirtualBox
 
-install %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/VirtualBox/VirtualBox-wrapper.sh
+install %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/VirtualBox/VirtualBox-wrapper.sh
 for f in {VBox{BFE,Manage,SDL,SVC,XPCOMIPCD},VirtualBox,vditool}; do
 	install out/linux.%{outdir}/release/bin/$f $RPM_BUILD_ROOT%{_libdir}/VirtualBox/$f
 	ln -s %{_libdir}/VirtualBox/VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/$f
@@ -337,13 +336,16 @@
 %endif
 
 install out/linux.%{outdir}/release/bin/VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
-install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
+install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
 
 install -d $RPM_BUILD_ROOT/etc/udev/rules.d
 install udev.conf $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules
 %endif
 
 %if %{with kernel}
+$RPM_BUILD_ROOT/etc/rc.d/init.d
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxdrv
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxadd
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxadd/vboxadd -d misc
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxdrv/vboxdrv -d misc
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxvfs/vboxvfs -d misc
@@ -396,7 +398,6 @@
 %dir %{_libdir}/VirtualBox/additions
 %dir %{_libdir}/VirtualBox/components
 %dir %{_libdir}/VirtualBox/nls
-%attr(754,root,root) /etc/rc.d/init.d/virtualbox
 %attr(755,root,root) %{_bindir}/mountvboxsf
 %attr(755,root,root) %{_bindir}/vditool
 %attr(755,root,root) %{_bindir}/VBox*
@@ -465,10 +466,12 @@
 %if %{with kernel}
 %files -n kernel%{_alt_kernel}-misc-vboxadd
 %defattr(644,root,root,755)
+%attr(754,root,root) /etc/rc.d/init.d/vboxadd
 /lib/modules/%{_kernel_ver}/misc/vboxadd.ko*
 
 %files -n kernel%{_alt_kernel}-misc-vboxdrv
 %defattr(644,root,root,755)
+%attr(754,root,root) /etc/rc.d/init.d/vboxdrv
 /lib/modules/%{_kernel_ver}/misc/vboxdrv.ko*
 
 %files -n kernel%{_alt_kernel}-misc-vboxvfs
@@ -482,6 +485,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2008-05-16 13:24:26  hawk
+- added init script and udev rule to create /dev/vboxadd on guest systems,
+  moved init scripts from userspace to kernel packages, w/o them they're
+  useless anyway and cause guests to require whole VirtualBox instead of
+  just kernel modules
+- relase 2.1 because 'cvs mv VirtualBox.init,v VirtualBox-vboxdrv.init,v'
+  is needed
+
 Revision 1.83  2008-05-13 11:48:19  hawk
 - added patch removing max display resolution limits for guest systems
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/VirtualBox.spec?r1=1.83&r2=1.84&f=u