rpms/VirtualBox-OSE-kmod/F-13 VirtualBox-OSE-kmod.spec,1.50,1.51

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/free/rpms/VirtualBox-OSE-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21285/F-13

Modified Files:
	VirtualBox-OSE-kmod.spec 
Log Message:
Merge from devel


Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/F-13/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- VirtualBox-OSE-kmod.spec	7 Jul 2010 14:16:51 -0000	1.50
+++ VirtualBox-OSE-kmod.spec	13 Jul 2010 07:23:21 -0000	1.51
@@ -3,15 +3,23 @@
 # "buildforkernels newest" macro for just that build; immediately after
 # queuing that build enable the macro again for subsequent builds; that way
 # a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
+#define buildforkernels akmod
+
+# In prerelease builds (such as betas), this package has the same
+# major version number, while the kernel module abi is not guarranteed
+# to be stable. This is so that we force the module update in sync with
+# userspace.
+#global prerel beta3
+%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
 
 # Allow only root to access vboxdrv regardless of the file mode
 # use only for debugging!
 %bcond_without hardening
 
 Name:           VirtualBox-OSE-kmod
-Version:        3.1.8
-Release:        1.4
+Version:        3.2.6
+Release:        1%{?dist}
 
 Summary:        Kernel module for VirtualBox-OSE
 Group:          System Environment/Kernel
@@ -21,7 +29,7 @@
 Source1:        VirtualBox-OSE-kmod-1.6.4-kernel-variants.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-OSE-kmodsrc = %{version}, xz
+%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-OSE-kmodsrc = %{version}%{?prereltag}, xz
 BuildRequires:  %{AkmodsBuildRequires}
 
 # needed for plague to make sure it builds for i586 and i686
@@ -61,7 +69,6 @@
 %build
 for kernel_version in %{?kernel_versions}; do
     for module in vbox{drv,guest,netadp,netflt,sf,video}; do
-
         make VBOX_USE_INSERT_PAGE=1 %{?_smp_mflags} -C "${kernel_version##*___}" SUBDIRS="${PWD}/_kmod_build_${kernel_version%%___*}/${module}"  modules
     done
 done
@@ -91,36 +98,20 @@
 
 
 %changelog
-* Wed Jul 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1.8-1.4
-- rebuild for new kernel
-
-* Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1.8-1.3
-- rebuild for new kernel
-
-* Fri May 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1.8-1.2
-- rebuild for new kernel
-
-* Thu May 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1.8-1.1
-- rebuild for new kernel
-
-* Tue May 18 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.1.8-1
+* Mon Jul 12 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.6-1
 - New release
-- Rename shared folders module
-
-* Mon May 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1.6-1.5
-- rebuild for new kernel
 
-* Fri May 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1.6-1.4
-- rebuild for new kernel
+* Fri Jun 18 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.4-1
+- New release
 
-* Tue May 04 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1.6-1.3
-- rebuild for new kernel
+* Mon May 10 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.0-1
+- Release
 
-* Thu Apr 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1.6-1.2
-- rebuild for new kernel
+* Mon May 10 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.0-0.2.beta2
+- Beta 2
 
-* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1.6-1.1
-- rebuild for new kernel
+* Thu Apr 29 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.0-0.1.beta1
+- Beta
 
 * Fri Mar 26 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.1.6-1
 - New release
@@ -140,27 +131,9 @@
 * Thu Nov 12 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.1.0-0.1.beta1
 - Bump to beta
 
-* Tue Nov 10 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.10-1.4
-- rebuild for F12 release kernel
-
-* Mon Nov 09 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.10-1.3
-- rebuild for new kernels
-
-* Fri Nov 06 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.10-1.2
-- rebuild for new kernels
-
-* Wed Nov 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.10-1.1
-- rebuild for new kernels
-
 * Sun Nov 01 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.10-1
 - Version bump
 
-* Sat Oct 24 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.8-1.2
-- rebuild for new kernels
-
-* Wed Oct 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.8-1.1
-- rebuild for new kernels
-
 * Wed Oct 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.8-1
 - Version bump
 
@@ -195,24 +168,6 @@
 * Sun May 31 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2.4-1
 - New release
 
-* Thu May 28 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.2.2-1.6
-- rebuild for new kernels
-
-* Wed May 27 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.2.2-1.5
-- rebuild for new kernels
-
-* Thu May 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.2.2-1.4
-- rebuild for new kernels
-
-* Wed May 13 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.2.2-1.3
-- rebuild for new kernels
-
-* Tue May 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.2.2-1.2
-- rebuild for akmods
-
-* Tue May 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.2.2-1.1
-- rebuild for new kernels
-
 * Sun May 03 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2.2-1
 - New release