rpms/VirtualBox-OSE-kmod/F-11 VirtualBox-OSE-kmod.spec,1.27,1.28

[Lubomir Rintel]

Author: lkundrak

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

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-11/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- VirtualBox-OSE-kmod.spec	1 Sep 2009 05:15:01 -0000	1.27
+++ VirtualBox-OSE-kmod.spec	11 Sep 2009 07:07:52 -0000	1.28
@@ -3,11 +3,15 @@
 # "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
+
+# Allow only root to access vboxdrv regardless of the file mode
+# use only for debugging!
+%bcond_without hardening
 
 Name:           VirtualBox-OSE-kmod
-Version:        3.0.4
-Release:        2%{?dist}.6
+Version:        3.0.6
+Release:        1%{?dist}
 
 Summary:        Kernel module for VirtualBox-OSE
 Group:          System Environment/Kernel
@@ -17,11 +21,9 @@
 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}
+%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-OSE-kmodsrc = %{version}, xz
 BuildRequires:  %{AkmodsBuildRequires}
 
-Requires:       VirtualBox-OSE = %{version}-%{release}
-
 # needed for plague to make sure it builds for i586 and i686
 ExclusiveArch:  i586 i686 x86_64
 
@@ -39,7 +41,7 @@
 
 %prep
 %setup -T -c
-tar --use-compress-program lzma -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.lzma
+tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
 
 # error out if there was something wrong with kmodtool
 %{?kmodtool_check}
@@ -47,6 +49,9 @@
 # print kmodtool output for debugging purposes:
 kmodtool --target %{_target_cpu}  --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} --filterfile %{SOURCE1} 2>/dev/null
 
+# This is hardcoded in Makefiles
+# Kto zisti, preco tu nefunguje %%without hardening ma u mna nanuk
+%{?with_hardening:find %{name}-%{version} -name Makefile |xargs sed 's/-DVBOX_WITH_HARDENING//' -i}
 
 for kernel_version in %{?kernel_versions} ; do
     cp -al %{name}-%{version} _kmod_build_${kernel_version%%___*}
@@ -85,23 +90,14 @@
 
 
 %changelog
-* Tue Sep 01 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.4-2.6
-- rebuild for new kernels
+* Mon Aug 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.6-1
+- Update to 3.0.6, re-enable hardening
 
-* Thu Aug 27 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.4-2.5
-- rebuild for new kernels
-
-* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.4-2.4
-- rebuild for new kernels
+* Mon Aug 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.4-4
+- Source package is now xz-compressed
 
-* Sat Aug 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.4-2.3
-- rebuild for new kernels
-
-* Sat Aug 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.4-2.2
-- rebuild for new kernels
-
-* Fri Aug 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.4-2.1
-- rebuild for new kernels
+* Sat Aug 15 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.4-2
+- Make it possible to disable hardening, do so by default
 
 * Sun Aug 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.4-1
 - New release