rpms/VirtualBox-OSE/devel VirtualBox-OSE.spec,1.5,1.6

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28116/devel

Modified Files:
	VirtualBox-OSE.spec 
Log Message:
Guest additions rework


Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VirtualBox-OSE.spec	31 May 2009 14:15:57 -0000	1.5
+++ VirtualBox-OSE.spec	29 Jun 2009 03:09:41 -0000	1.6
@@ -10,7 +10,7 @@
 
 Name:           VirtualBox-OSE
 Version:        2.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A general-purpose full virtualizer for PC hardware
 
 Group:          Development/Tools
@@ -68,32 +68,27 @@
 Group:          System Environment/Base
 Requires:       %{name}-kmod = %{version}
 Provides:       %{name}-kmod-common = %{version}
+Requires:       hal
+Requires:       xorg-x11-server-Xorg
+Requires:       xorg-x11-xinit
+Provides:       xorg-x11-drv-VirtualBox = %{version}-%{release}
+Obsoletes:      xorg-x11-drv-VirtualBox < %{version}-%{release}
 
 %description guest
 Tools that utilize kernel modules for supporting integration
 with the Host, including file sharing and tracking of mouse pointer
-movement.
+movement and X.org X11 video and mouse driver.
 
 
 %package kmodsrc
 Summary:        %{name} kernel module source code
 Group:          System Environment/Kernel
-Requires:       xorg-x11-server-Xorg
 
 %description kmodsrc
 Source tree used for building kernel module packages (%{name}-kmod)
 which is generated during the build of main package.
 
 
-%package -n xorg-x11-drv-%{name}
-Summary:        X.org X11 %{name} video and mouse driver
-Group:          User Interface/X Hardware Support
-Requires:       xorg-x11-server-Xorg
-
-%description -n xorg-x11-drv-%{name}
-X.org X11 %{name} video and mouse driver.
-
-
 %prep
 %setup -q -n VirtualBox-%{version}_OSE
 cp %{SOURCE1} . # PDF User Guide
@@ -193,19 +188,37 @@
 install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
         obj/bin/VBox.png
 
-# X.Org drivers
-install -m 0755 -D obj/bin/additions/vboxmouse_drv_71.so \
+# Guest X.Org drivers
+%if 0%{?fedora} >= 10
+%global x11_api 16
+%endif
+
+install -m 0755 -D obj/bin/additions/vboxmouse_drv_%{x11_api}.so \
         $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxmouse_drv.so
-install -m 0755 -D obj/bin/additions/vboxvideo_drv_71.so \
+install -m 0755 -D obj/bin/additions/vboxvideo_drv_%{x11_api}.so \
         $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
 
-# Guest Additions
-install -p -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
+install -m 0755 -D src/VBox/Additions/linux/installer/90-vboxguest.fdi \
+	$RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/20thirdparty/90-vboxguest.fdi
+
+# Guest tools
+install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} 	\
         obj/bin/additions/mountvboxsf           \
         obj/bin/additions/vboxadd-timesync      \
         obj/bin/additions/VBoxClient            \
         obj/bin/additions/VBoxControl
 
+install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
+	$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
+
+install -m 0755 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
+	$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+
+# Guest libraries
+install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} 	\
+        obj/bin/additions/VBoxOGL*.so
+
 # Installation root configuration
 install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vbox
 echo 'INSTALL_DIR="%{_libdir}/virtualbox"' > $RPM_BUILD_ROOT/%{_sysconfdir}/vbox/vbox.cfg
@@ -244,8 +257,7 @@
 # it? Bring it back.
 
 set +o posix
-diff <((find obj/bin/additions/* -maxdepth 0 -type f    \
-                -not -name 'VBoxOGL*.so'                \
+diff -u <((find obj/bin/additions/* -maxdepth 0 -type f    \
                 -not -name 'autorun.sh'                 \
                 -not -name '*_drv*'                     \
                 -exec basename '{}' \;
@@ -258,6 +270,7 @@
                 -exec basename '{}' \;) |sort) \
         <(find $RPM_BUILD_ROOT%{_libdir}/virtualbox/*   \
                 $RPM_BUILD_ROOT%{_bindir}/*             \
+                $RPM_BUILD_ROOT%{_libdir}/*OGL*.so      \
                 $RPM_BUILD_ROOT%{_datadir}/{pixmaps,applications}/* \
                 -maxdepth 0 -type f                     \
                 -not -name VBox -exec basename '{}' \; |sort)
@@ -268,6 +281,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+# Guest additions install the OGL libraries
+%post guest -p /sbin/ldconfig
+%postun guest -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/VBox
@@ -298,6 +316,11 @@
 %{_bindir}/vboxadd-timesync
 %{_bindir}/VBoxClient
 %{_bindir}/VBoxControl
+%{_libdir}/xorg/modules/drivers/*
+%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
+%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+%{_libdir}/VBoxOGL*.so
+%{_datadir}/hal/fdi/information/20thirdparty/90-vboxguest.fdi
 %config %{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
 %doc COPYING
 
@@ -307,12 +330,12 @@
 %{_datadir}/%{name}-kmod-%{version}
 
 
-%files -n xorg-x11-drv-%{name}
-%defattr(-,root,root,-)
-%{_libdir}/xorg/modules/drivers/*
-
-
 %changelog
+* Mon Jun 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2.4-2
+- They left for beer too early, dicks, so we fix up wbox now
+- Make guest additions just work
+- Merge xorg stuff with rest of guest additions
+
 * Sun May 31 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2.4-1
 - New upstream release