This commit was manufactured by cvs2git to create branch 'LINUX_2_6_22'.

Sprout from master 2008-03-02 16:36:00 UTC Elan Ruusamäe <glen@pld-linux.org> '- add subsys locking for %post scriptlet'
Cherrypick from unlabeled-1.44.2 2008-04-04 15:45:49 UTC Elan Ruusamäe <glen@pld-linux.org> '- VirtualBox -> VirtualBox OSE':
    VirtualBox.spec -> 1.44.2.13

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 56ea8e62a19affd2bf6d0020906f2752fbc33920..4c92fefad0bd8d93d8bbf4aebf4473d673dd09d1 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -9,10 +9,10 @@
 # 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             9
-
 %if %{without kernel}
 %undefine      with_dist_kernel
 %endif
@@ -27,7 +27,7 @@ Summary:      VirtualBox OSE - x86 hardware virtualizer
 Summary(pl.UTF-8):     VirtualBox OSE - wirtualizator sprzętu x86
 Name:          %{pname}%{_alt_kernel}
 Version:       1.5.6
-Release:       %{rel}
+Release:       2
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://www.virtualbox.org/download/%{version}/%{pname}-%{version}-1_OSE.tar.bz2
@@ -47,6 +47,7 @@ Patch4:               %{pname}-configure-spaces.patch
 URL:           http://www.virtualbox.org/
 %if %{with userspace}
 BuildRequires: SDL-devel
+BuildRequires: XFree86-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: bash
 BuildRequires: bcc
@@ -54,7 +55,7 @@ BuildRequires:        bin86
 BuildRequires: gcc >= 5:3.2.3
 BuildRequires: iasl
 %endif
-%{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.20}
+%{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.7}
 %if %{with userspace}
 BuildRequires: libIDL-devel
 BuildRequires: libuuid-devel
@@ -69,12 +70,11 @@ BuildRequires:      rpmbuild(macros) >= 1.379
 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
-BuildRequires: glibc-devel(i686)
-BuildRequires: libstdc++-multilib-devel
+BuildRequires: libstdc++32-devel
+# 32bit glibc-devel
+BuildRequires: /usr/include/gnu/stubs-32.h
 %endif
 %endif
 Requires(post,preun):  /sbin/chkconfig
@@ -105,9 +105,9 @@ well-defined internal programming interfaces and a client/server
 design. This makes it easy to control it from several interfaces at
 once: for example, you can start a virtual machine in a typical
 virtual machine GUI and then control that machine from the command
-line. VirtualBox OSE also comes with a full Software Development Kit: even
-though it is Open Source Software, you don't have to hack the source
-to write a new interface for VirtualBox OSE.
+line. VirtualBox OSE also comes with a full Software Development Kit:
+even though it is Open Source Software, you don't have to hack the
+source to write a new interface for VirtualBox OSE.
 
 Virtual machine descriptions in XML: the configuration settings of
 virtual machines are stored entirely in XML and are independent of the
@@ -127,8 +127,9 @@ dobrze zaprojektowanym wewnętrznym interfejsem programowym typu
 klient/serwer. Dzięki temu można łatwo kontrolować go za pomocą
 różnych interfejsów. Można na przykład uruchomić maszynę wirtualną z
 poziomu interfejsu graficznego, a później kontrolować ją z linii
-poleceń. VirtualBox OSE dostarcza również pełny pakiet deweloperski, co
-pozwala stworzyć dowolny inny interfejs zarządzania maszyną wirtualną.
+poleceń. VirtualBox OSE dostarcza również pełny pakiet deweloperski,
+co pozwala stworzyć dowolny inny interfejs zarządzania maszyną
+wirtualną.
 
 Opisy maszyn wirtualnych w XML-u: konfiguracje poszczególnych maszyn
 wirtualnych są w całości przechowywane w XML-u i są niezależne od
@@ -138,28 +139,22 @@ konfigurację maszyny wirtualnej na inny komputer.
 %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
-Release:       %{rel}
 Group:         Base/Kernel
 Requires:      udev
 
 %description udev
-udev rules for VirtualBox OSE kernel modules
+udev rules for VirtualBox OSE kernel modules.
 
 %description udev -l pl.UTF-8
-Reguły udev dla modułów jądra Linuksa dla VirtualBoksa
+Reguły udev dla modułów jądra Linuksa dla VirtualBoksa.
 
 %package -n kernel%{_alt_kernel}-misc-vboxadd
 Summary:       Linux kernel module for VirtualBox OSE
 Summary(pl.UTF-8):     Moduł jądra Linuksa 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
-#Requires(postun):     %%releq_kernel
-%endif
-Provides:      kernel(vboxadd) = %{version}-%{rel}
+%{?with_dist_kernel:Requires:  kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
 
 %description -n kernel%{_alt_kernel}-misc-vboxadd
 Linux kernel module vboxadd for VirtualBox OSE.
@@ -170,15 +165,10 @@ Moduł jądra Linuksa vboxadd dla VirtualBoksa.
 %package -n kernel%{_alt_kernel}-misc-vboxdrv
 Summary:       Linux kernel module for VirtualBox OSE
 Summary(pl.UTF-8):     Moduł jądra Linuksa 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
-Requires(postun):      %releq_kernel
-%endif
-Provides:      kernel(vboxdrv) = %{version}-%{rel}
+%{?with_dist_kernel:Requires:  kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
 
 %description -n kernel%{_alt_kernel}-misc-vboxdrv
 Linux kernel module vboxdrv for VirtualBox OSE.
@@ -189,15 +179,10 @@ Moduł jądra Linuksa vboxdrv dla VirtualBoksa.
 %package -n kernel%{_alt_kernel}-misc-vboxvfs
 Summary:       Linux kernel module for VirtualBox OSE
 Summary(pl.UTF-8):     Moduł jądra Linuksa 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
-Requires(postun):      %releq_kernel
-%endif
-Provides:      kernel(vboxvfs) = %{version}-%{rel}
+%{?with_dist_kernel:Requires:  kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
 
 %description -n kernel%{_alt_kernel}-misc-vboxvfs
 Linux kernel module vboxvfs for VirtualBox OSE.
@@ -205,30 +190,70 @@ Linux kernel module vboxvfs for VirtualBox OSE.
 %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 OSE
+Summary(pl.UTF-8):     Moduł jądra Linuksa SMP dla VirtualBoksa
+Group:         Base/Kernel
+Requires(post,postun): /sbin/depmod
+Requires:      dev >= 2.9.0-7
+%{?with_dist_kernel:Requires:  kernel%{_alt_kernel}-smp(vermagic) = %{_kernel_ver}}
+
+%description -n kernel%{_alt_kernel}-smp-misc-vboxadd
+Linux SMP kernel module vboxadd for VirtualBox OSE.
+
+%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 OSE
+Summary(pl.UTF-8):     Moduł jądra Linuksa SMP dla VirtualBoksa
+Group:         Base/Kernel
+Requires(post,postun): /sbin/depmod
+Requires:      dev >= 2.9.0-7
+%{?with_dist_kernel:Requires:  kernel%{_alt_kernel}-smp(vermagic) = %{_kernel_ver}}
+
+%description -n kernel%{_alt_kernel}-smp-misc-vboxdrv
+Linux SMP kernel module vboxdrv for VirtualBox OSE.
+
+%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 OSE
+Summary(pl.UTF-8):     Moduł jądra Linuksa SMP dla VirtualBoksa
+Group:         Base/Kernel
+Requires(post,postun): /sbin/depmod
+Requires:      dev >= 2.9.0-7
+%{?with_dist_kernel:Requires:  kernel%{_alt_kernel}-smp(vermagic) = %{_kernel_ver}}
+
+%description -n kernel%{_alt_kernel}-smp-misc-vboxvfs
+Linux SMP kernel module vboxvfs for VirtualBox OSE.
+
+%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 OSE 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 OSE 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 OSE 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 OSE 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
@@ -274,8 +299,7 @@ sed -i -e '/#.*define.*RTMEMALLOC_EXEC_HEAP/d' vboxadd/r0drv/linux/alloc-r0drv-l
 cd PLD-MODULE-BUILD
 %build_kernel_modules -m vboxadd -C vboxadd
 %build_kernel_modules -m vboxdrv -C vboxdrv
-cp -a vboxadd/Module.symvers vboxvfs
-%build_kernel_modules -m vboxvfs -C vboxvfs -c
+%build_kernel_modules -m vboxvfs -C vboxvfs
 cd ..
 %endif
 
@@ -317,11 +341,11 @@ install out/linux.%{outdir}/release/bin/additions/mountvboxsf             \
        $RPM_BUILD_ROOT%{_bindir}
 
 %ifnarch %{x8664}
-install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
-install out/linux.%{outdir}/release/bin/additions/vboxmouse_drv_14.so  \
-       $RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/vboxmouse_drv.so
-install out/linux.%{outdir}/release/bin/additions/vboxvideo_drv_14.so  \
-       $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+install -d $RPM_BUILD_ROOT%{_x_libraries}/modules/{drivers,input}
+install out/linux.%{outdir}/release/bin/additions/vboxmouse_drv_70.so  \
+       $RPM_BUILD_ROOT%{_x_libraries}/modules/input/vboxmouse_drv.so
+install out/linux.%{outdir}/release/bin/additions/vboxvideo_drv_70.so  \
+       $RPM_BUILD_ROOT%{_x_libraries}/modules/drivers/vboxvideo_drv.so
 %endif
 
 install out/linux.%{outdir}/release/bin/VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
@@ -345,7 +369,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add virtualbox
-%service virtualbox restart "VirtualBox"
+%service virtualbox restart "VirtualBox OSE"
 
 %preun
 if [ "$1" = "0" ]; then
@@ -376,6 +400,12 @@ fi
 %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)
@@ -440,17 +470,18 @@ fi
 
 # 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) %{_x_libraries}/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) %{_x_libraries}/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*
@@ -463,3 +494,18 @@ fi
 %defattr(644,root,root,755)
 /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)
+/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