SPECS (AC-branch): VirtualBox.spec - adjusted for Ac

hawk hawk at pld-linux.org
Fri Jan 4 23:42:16 CET 2008 

Author: hawk                         Date: Fri Jan  4 22:42:16 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- adjusted for Ac

---- Files affected:
SPECS:
   VirtualBox.spec (1.44 -> 1.44.2.1) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.44 SPECS/VirtualBox.spec:1.44.2.1
--- SPECS/VirtualBox.spec:1.44	Fri Jan  4 19:18:00 2008
+++ SPECS/VirtualBox.spec	Fri Jan  4 23:42:11 2008
@@ -12,6 +12,8 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel module
+%bcond_without	up		# without up packages
+%bcond_without	smp		# without SMP kernel modules
 %bcond_without	userspace	# don't build userspace package
 
 %define		rel		1
@@ -41,6 +43,7 @@
 Patch3:		%{name}-disable-xclient-build.patch
 URL:		http://www.virtualbox.org/
 BuildRequires:	SDL-devel
+BuildRequires:	XFree86-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	bash
 BuildRequires:	bcc
@@ -59,7 +62,6 @@
 BuildRequires:	which
 BuildRequires:	xalan-c-devel >= 1.10.0
 BuildRequires:	xerces-c-devel >= 2.6.0
-BuildRequires:	xorg-lib-libXcursor-devel
 BuildRequires:	zlib-devel >= 1.2.1
 %ifarch %{x8664}
 BuildRequires:	gcc-multilib
@@ -131,8 +133,8 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
 %if %{with dist_kernel}
-%requires_releq_kernel
-Requires(postun):	%releq_kernel
+%requires_releq_kernel_up
+Requires(postun):	%releq_kernel_up
 %endif
 Provides:	kernel(vboxadd) = %{version}-%{rel}
 
@@ -150,8 +152,8 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
 %if %{with dist_kernel}
-%requires_releq_kernel
-Requires(postun):	%releq_kernel
+%requires_releq_kernel_up
+Requires(postun):	%releq_kernel_up
 %endif
 Provides:	kernel(vboxdrv) = %{version}-%{rel}
 
@@ -169,8 +171,8 @@
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
 %if %{with dist_kernel}
-%requires_releq_kernel
-Requires(postun):	%releq_kernel
+%requires_releq_kernel_up
+Requires(postun):	%releq_kernel_up
 %endif
 Provides:	kernel(vboxvfs) = %{version}-%{rel}
 
@@ -180,30 +182,87 @@
 %description -n kernel%{_alt_kernel}-misc-vboxvfs -l pl.UTF-8
 Moduł jądra Linuksa vboxvfs dla VirtualBoksa.
 
-%package -n xorg-driver-input-vboxmouse
+%package -n kernel%{_alt_kernel}-smp-misc-vboxadd
+Summary:	Linux SMP kernel module for VirtualBox
+Summary(pl.UTF-8):	Moduł jądra Linuksa SMP dla VirtualBoksa
+Release:	%{rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+Requires(post,postun):	/sbin/depmod
+Requires:	dev >= 2.9.0-7
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):	%releq_kernel_smp
+%endif
+Provides:	kernel(vboxadd) = %{version}-%{rel}
+
+%description -n kernel%{_alt_kernel}-smp-misc-vboxadd
+Linux SMP kernel module vboxadd for VirtualBox.
+
+%description -n kernel%{_alt_kernel}-smp-misc-vboxadd -l pl.UTF-8
+Moduł jądra Linuksa SMP vboxadd dla VirtualBoksa.
+
+%package -n kernel%{_alt_kernel}-smp-misc-vboxdrv
+Summary:	Linux SMP kernel module for VirtualBox
+Summary(pl.UTF-8):	Moduł jądra Linuksa SMP dla VirtualBoksa
+Release:	%{rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+Requires(post,postun):	/sbin/depmod
+Requires:	dev >= 2.9.0-7
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):	%releq_kernel_smp
+%endif
+Provides:	kernel(vboxdrv) = %{version}-%{rel}
+
+%description -n kernel%{_alt_kernel}-smp-misc-vboxdrv
+Linux SMP kernel module vboxdrv for VirtualBox.
+
+%description -n kernel%{_alt_kernel}-smp-misc-vboxdrv -l pl.UTF-8
+Moduł jądra Linuksa SMP vboxdrv dla VirtualBoksa.
+
+%package -n kernel%{_alt_kernel}-smp-misc-vboxvfs
+Summary:	Linux SMP kernel module for VirtualBox
+Summary(pl.UTF-8):	Moduł jądra Linuksa SMP dla VirtualBoksa
+Release:	%{rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+Requires(post,postun):	/sbin/depmod
+Requires:	dev >= 2.9.0-7
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):	%releq_kernel_smp
+%endif
+Provides:	kernel(vboxvfs) = %{version}-%{rel}
+
+%description -n kernel%{_alt_kernel}-smp-misc-vboxvfs
+Linux SMP kernel module vboxvfs for VirtualBox.
+
+%description -n kernel%{_alt_kernel}-smp-misc-vboxvfs -l pl.UTF-8
+Moduł jądra Linuksa SMP vboxvfs dla VirtualBoksa.
+
+%package -n X11-driver-input-vboxmouse
 Summary:	X.org mouse driver for VirtualBox guest OS
 Summary(pl.UTF-8):	Sterownik myszy dla systemu gościa w VirtualBoksie
 Release:	%{rel}
 Group:		X11/Applications
-Requires:	xorg-xserver-server >= 1.0.99.901
+Requires:	X11-Xserver >= 1:6.9.0
 
-%description -n xorg-driver-input-vboxmouse
+%description -n X11-driver-input-vboxmouse
 X.org mouse driver for VirtualBox guest OS.
 
-%description -n xorg-driver-input-vboxmouse  -l pl.UTF-8
+%description -n X11-driver-input-vboxmouse  -l pl.UTF-8
 Sterownik myszy dla systemu gościa w VirtualBoksie.
 
-%package -n xorg-driver-video-vboxvideo
+%package -n X11-driver-video-vboxvideo
 Summary:	X.org video driver for VirtualBox guest OS
 Summary(pl.UTF-8):	Sterownik grafiki dla systemu gościa w VirtualBoksie
 Release:	%{rel}
 Group:		X11/Applications
-Requires:	xorg-xserver-server >= 1.0.99.901
+Requires:	X11-Xserver >= 1:6.9.0
 
-%description -n xorg-driver-video-vboxvideo
+%description -n X11-driver-video-vboxvideo
 X.org video driver for VirtualBox guest OS.
 
-%description -n xorg-driver-video-vboxvideo -l pl.UTF-8
+%description -n X11-driver-video-vboxvideo -l pl.UTF-8
 Sterownik grafiki dla systemu gościa w VirtualBoksie.
 
 %prep
@@ -233,7 +292,7 @@
 %endif
 
 %if %{with dist_kernel}
-ln -sf $KDIR/include/linux/autoconf-dist.h $KDIR/include/linux/autoconf.h
+ln -sf $KDIR/include/linux/autoconf-up.h $KDIR/include/linux/autoconf.h
 %else
 ln -sf $KDIR/include/linux/autoconf-nondist.h $KDIR/include/linux/autoconf.h
 %endif
@@ -268,8 +327,8 @@
 install -d \
 	$RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_desktopdir}} \
 	$RPM_BUILD_ROOT%{_libdir}/VirtualBox \
-	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers \
-	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/input
+	$RPM_BUILD_ROOT%{_prefix}/X11R6/modules/drivers \
+	$RPM_BUILD_ROOT%{_prefix}/X11R6/modules/input
 
 install %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/VirtualBox/VirtualBox-wrapper.sh
 for f in {VBox{BFE,Manage,SDL,SVC,XPCOMIPCD},VirtualBox,vditool}; do
@@ -293,10 +352,10 @@
 	$RPM_BUILD_ROOT%{_bindir}
 
 install out/linux.%{outdir}/release/bin/additions/vboxmouse_drv_71.so	\
-	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/vboxmouse_drv.so
+	$RPM_BUILD_ROOT%{_prefix}/X11R6/modules/input/vboxmouse_drv.so
 
 install out/linux.%{outdir}/release/bin/additions/vboxvideo_drv_71.so	\
-	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+	$RPM_BUILD_ROOT%{_prefix}/X11R6/modules/drivers/vboxvideo_drv.so
 
 install out/linux.%{outdir}/release/bin/VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
 install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
@@ -346,6 +405,12 @@
 %postun	-n kernel%{_alt_kernel}-misc-vboxvfs
 %depmod %{_kernel_ver}
 
+%post	-n kernel%{_alt_kernel}-smp-misc-vboxdrv
+%depmod %{_kernel_ver}smp
+
+%postun	-n kernel%{_alt_kernel}-smp-misc-vboxdrv
+%depmod %{_kernel_ver}smp
+
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -397,17 +462,18 @@
 
 # Drivers are for Guest OS, which is 32-bit.
 %ifnarch %{x8664}
-%files -n xorg-driver-input-vboxmouse
+%files -n X11-driver-input-vboxmouse
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/input/vboxmouse_drv.so
+%attr(755,root,root) %{_prefix}/X11R6/modules/input/vboxmouse_drv.so
 
-%files -n xorg-driver-video-vboxvideo
+%files -n X11-driver-video-vboxvideo
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+%attr(755,root,root) %{_prefix}/X11R6/modules/drivers/vboxvideo_drv.so
 %endif
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-misc-vboxadd
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/vboxadd.ko*
@@ -422,12 +488,31 @@
 /lib/modules/%{_kernel_ver}/misc/vboxvfs.ko*
 %endif
 
+%if %{with smp} && %{with dist_kernel}
+%files -n kernel%{_alt_kernel}-smp-misc-vboxadd
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}smp/misc/vboxadd.ko*
+
+%files -n kernel%{_alt_kernel}-smp-misc-vboxdrv
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/virtualbox.rules
+/lib/modules/%{_kernel_ver}smp/misc/vboxdrv.ko*
+
+%files -n kernel%{_alt_kernel}-smp-misc-vboxvfs
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}smp/misc/vboxvfs.ko*
+%endif
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44.2.1  2008-01-04 22:42:11  hawk
+- adjusted for Ac
+
 Revision 1.44  2008-01-04 18:18:00  qboosh
 - pl fixes, reduced excessive underscores
 
================================================================

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

More information about the pld-cvs-commit mailing list