SPECS: VirtualBox.spec - init script not needed - dropped.

[kosmo]

Author: kosmo                        Date: Mon Oct  1 14:15:17 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- init script not needed - dropped.

---- Files affected:
SPECS:
   VirtualBox.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.31 SPECS/VirtualBox.spec:1.32
--- SPECS/VirtualBox.spec:1.31	Mon Oct  1 15:37:22 2007
+++ SPECS/VirtualBox.spec	Mon Oct  1 16:15:12 2007
@@ -4,6 +4,7 @@
 # - Find how to compile with PLD CFLAGS/CXXFLAGS/LDFLAGS.
 # - Package SDK.
 # - Package utils (and write initscripts ?) for Guest OS.
+# - Add udev rule.
 #
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
@@ -25,11 +26,10 @@
 Group:		Applications/Emulators
 Source0:	http://www.virtualbox.org/download/%{version}/%{name}-%{version}_OSE.tar.bz2
 # Source0-md5:	56c074900260c109ed735c08e726fe81
-Source1:	virtualbox.init
-Source2:	http://www.virtualbox.org/download/UserManual.pdf
+Source1:	http://www.virtualbox.org/download/UserManual.pdf
 # Source2-md5:	2e5458bd5b4b9acd18cc86866e8a7284
-Source3:	%{name}.desktop
-Source4:	%{name}.sh
+Source2:	%{name}.desktop
+Source3:	%{name}.sh
 Patch0:		%{name}-configure.patch
 Patch1:		%{name}-qt-paths.patch
 Patch2:		%{name}-shared-libstdc++.patch
@@ -48,7 +48,6 @@
 BuildRequires:	qt-linguist
 BuildRequires:	rpmbuild(macros) >= 1.329
 BuildRequires:	xalan-c-devel >= 1.10.0
-#BuildRequires:	xcursor-devel
 BuildRequires:	xerces-c-devel >= 2.6.0
 BuildRequires:	xorg-lib-libXcursor-devel
 BuildRequires:	zlib-devel >= 1.2.1
@@ -197,7 +196,7 @@
 %patch0 -p0
 %patch1 -p0
 %patch2 -p1
-install %{SOURCE2} .
+install %{SOURCE1} .
 
 %build
 KDIR="%{_builddir}/%{buildsubdir}/kernel"
@@ -247,13 +246,13 @@
 install -d \
 	$RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_desktopdir}} \
 	$RPM_BUILD_ROOT%{_libdir}/VirtualBox \
-	$RPM_BUILD_ROOT/etc/rc.d/init.d \
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers \
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/input
 
+install %{SOURCE3} $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
-	install %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/$f
+	ln -s %{_libdir}/VirtualBox/VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/$f
 done
 
 install out/linux.%{_outdir}/release/bin/VBox*.so \
@@ -275,10 +274,8 @@
 install out/linux.%{_outdir}/release/bin/additions/vboxvideo_drv_71.so	\
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtualbox
-
 install out/linux.%{_outdir}/release/bin/VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
-install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 %endif
 
 %if %{with kernel}
@@ -299,23 +296,6 @@
 %pre
 %groupadd -g 221 -r -f vbox
 
-%post
-/sbin/chkconfig --add virtualbox
-%service virtualbox restart "VBoxSVC daemon"
-if [ "$1" = 1 ]; then
-%banner -e %{name} <<'EOF'
-Remember to add users which will use VirtualBox to vbox group or they won't be
-able to write to /dev/vboxdrv.
-EOF
-#'
-fi
-
-%preun
-if [ "$1" = "0" ]; then
-	%service virtualbox stop
-	/sbin/chkconfig --del virtualbox
-fi
-
 %postun
 if [ "$1" = "0" ]; then
 	%groupremove vbox
@@ -350,14 +330,15 @@
 %attr(755,root,root) %{_bindir}/vditool
 %attr(755,root,root) %{_bindir}/VBox*
 %attr(755,root,root) %{_bindir}/VirtualBox
+%attr(755,root,root) %{_libdir}/VirtualBox/vditool
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxSVC
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxBFE
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxManage
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxSDL
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxXPCOMIPCD
-%attr(755,root,root) %{_libdir}/VirtualBox/VirtualBox
 %attr(755,root,root) %{_libdir}/VirtualBox/VBox*.so
-%attr(755,root,root) %{_libdir}/VirtualBox/vditool
+%attr(755,root,root) %{_libdir}/VirtualBox/VirtualBox
+%attr(755,root,root) %{_libdir}/VirtualBox/VirtualBox-wrapper.sh
 %{_libdir}/VirtualBox/*.gc
 %{_libdir}/VirtualBox/*.r0
 %{_libdir}/VirtualBox/*.xpt
@@ -379,7 +360,6 @@
 %lang(sv) %{_libdir}/VirtualBox/nls/VirtualBox_sv.qm
 %lang(zh_CN) %{_libdir}/VirtualBox/nls/VirtualBox_zh_CN.qm
 %lang(zh_TW) %{_libdir}/VirtualBox/nls/VirtualBox_zh_TW.qm
-%attr(754,root,root) /etc/rc.d/init.d/virtualbox
 %{_pixmapsdir}/VBox.png
 %{_desktopdir}/%{name}.desktop
 
@@ -412,6 +392,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2007/10/01 14:15:12  kosmo
+- init script not needed - dropped.
+
 Revision 1.31  2007/10/01 13:37:22  kosmo
 - fixed vditool permissions
 
================================================================

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