Author: leigh123linux Update of /cvs/nonfree/rpms/nvidia-kmod/F-16 In directory se02.es.rpmfusion.net:/tmp/cvs-serv27758 Modified Files: nvidia-kmod.spec Added Files: kernel-3.3.patch Log Message: * Thu Mar 22 2012 leigh scott <leigh123linux(a)googlemail.com&gt; - 1:290.10-2 - patched to build with 3.3.0 kernel kernel-3.3.patch: conftest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE kernel-3.3.patch --- --- a/kernel/conftest.sh +++ b/kernel/conftest.sh @@ -122,7 +122,7 @@ build_cflags() { CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then - CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" + CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/generated" fi if [ -n "$BUILD_PARAMS" ]; then CFLAGS="$CFLAGS -D$BUILD_PARAMS" Index: nvidia-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-16/nvidia-kmod.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- nvidia-kmod.spec 21 Mar 2012 11:07:13 -0000 1.112 +++ nvidia-kmod.spec 22 Mar 2012 12:53:32 -0000 1.113 @@ -9,7 +9,7 @@ Epoch: 1 Version: 290.10 # Taken over by kmodtool -Release: 1%{?dist}.21 +Release: 2%{?dist} Summary: NVIDIA display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -25,6 +25,8 @@ Source11: nvidia-kmodtool-excludekernel-filterfile +Patch0: kernel-3.3.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # needed for plague to make sure it builds for i586 and i686 @@ -46,6 +48,13 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %setup -q -c -T -a 0 +# patch loop +for arch in x86 x86_64 +do +pushd nvidiapkg-${arch} +%patch0 -p1 +popd +done for kernel_version in %{?kernel_versions} ; do %ifarch %{ix86} @@ -55,7 +64,6 @@ %endif done - %build for kernel_version in %{?kernel_versions}; do pushd _kmod_build_${kernel_version%%___*}/kernel/ @@ -77,6 +85,9 @@ %changelog +* Thu Mar 22 2012 leigh scott <leigh123linux(a)googlemail.com&gt; - 1:290.10-2 +- patched to build with 3.3.0 kernel + * Wed Mar 21 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:290.10-1.21 - rebuild for updated kernel