packages: VirtualBox/VirtualBox.spec - package more guest apps, -doc subpac...

[glen]

Author: glen                         Date: Sat May 14 15:04:39 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- package more guest apps, -doc subpackage

---- Files affected:
packages/VirtualBox:
   VirtualBox.spec (1.365 -> 1.366) 

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.365 packages/VirtualBox/VirtualBox.spec:1.366
--- packages/VirtualBox/VirtualBox.spec:1.365	Fri May 13 08:41:50 2011
+++ packages/VirtualBox/VirtualBox.spec	Sat May 14 17:04:33 2011
@@ -110,8 +110,8 @@
 BuildRequires:	libxml2-devel >= 2.6.26
 BuildRequires:	libxslt-devel >= 1.1.17
 BuildRequires:	libxslt-progs >= 1.1.17
-BuildRequires:	mkisofs
 BuildRequires:	makeself
+BuildRequires:	mkisofs
 BuildRequires:	pam-devel
 BuildRequires:	pixman-devel
 BuildRequires:	pkgconfig
@@ -201,6 +201,13 @@
 lokalnej maszyny. Dzięki temu można szybko i łatwo przenieść
 konfigurację maszyny wirtualnej na inny komputer.
 
+%package doc
+Summary:	VirtualBox documentation
+Group:		Documentation
+
+%description doc
+This package contains VirtualBox User Manual.
+
 %package udev
 Summary:	udev rules for VirtualBox OSE kernel modules
 Summary(pl.UTF-8):	Reguły udev dla modułów jądra Linuksa dla VirtualBoksa
@@ -230,10 +237,10 @@
 %package guest
 Summary:	VirtualBox Guest Additions
 Group:		Base
-Suggests:	kernel%{_alt_kernel}-misc-vboxsf = %{version}-%{rel}@%{_kernel_ver_str}
-Suggests:	kernel%{_alt_kernel}-misc-vboxvideo = %{version}-%{rel}@%{_kernel_ver_str}
 Requires:	xorg-driver-input-vboxmouse = %{version}-%{release}
 Requires:	xorg-driver-video-vboxvideo = %{version}-%{release}
+Suggests:	kernel%{_alt_kernel}-misc-vboxsf = %{version}-%{rel}@%{_kernel_ver_str}
+Suggests:	kernel%{_alt_kernel}-misc-vboxvideo = %{version}-%{rel}@%{_kernel_ver_str}
 
 %description guest
 Tools that utilize kernel modules for supporting integration with the
@@ -540,7 +547,14 @@
 rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/scm
 
 # Guest Only Tools
+install -d $RPM_BUILD_ROOT/etc/{X11/xinit/xinitrc.d,xdg/autostart}
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxService
+mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxClient
+mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxControl
+install -p -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
+	$RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
+cp -p src/VBox/Additions/x11/Installer/vboxclient.desktop \
+	$RPM_BUILD_ROOT/etc/xdg/autostart/vboxclient.desktop
 
 # unknown - checkme
 %if 1
@@ -548,8 +562,6 @@
 rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPLoggerCtl
 rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPUninstall
 rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/VBox.sh
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxClient
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxControl
 rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxshell.py
 rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/xpidl
 %endif
@@ -682,7 +694,6 @@
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%{?with_doc:%doc %{outdir}/UserManual.pdf}
 %dir %{_libdir}/VirtualBox
 %dir %{_libdir}/VirtualBox/ExtensionPacks
 %dir %{_libdir}/VirtualBox/additions
@@ -801,6 +812,11 @@
 # integration and other desktop services
 # NOTE: the filelist is incomplete too
 %attr(755,root,root) %{_bindir}/VBoxService
+%attr(755,root,root) %{_bindir}/VBoxClient
+%attr(755,root,root) %{_bindir}/VBoxControl
+%attr(755,root,root) %{_bindir}/VBoxService
+/etc/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
+/etc/xdg/autostart/vboxclient.desktop
 
 %attr(755,root,root) %{_libdir}/VirtualBox/additions/autorun.sh
 %attr(755,root,root) %{_libdir}/VirtualBox/additions/vboxadd
@@ -811,6 +827,12 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/security/pam_vbox.so
 
+%if %{with doc}
+%files doc
+%defattr(644,root,root,755)
+%doc %{outdir}/UserManual.pdf
+%endif
+
 %files udev
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/virtualbox.rules
@@ -870,6 +892,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.366  2011/05/14 15:04:33  glen
+- package more guest apps, -doc subpackage
+
 Revision 1.365  2011/05/13 06:41:50  glen
 - identify our build as _PLD, see http://www.virtualbox.org/wiki/Editions
 
================================================================

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