rpms/nvidia-96xx-kmod/F-16 drop24support.patch, NONE, 1.1 nvidia-96xx-kmod.spec, 1.36, 1.37

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/nvidia-96xx-kmod/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20270

Modified Files:
	nvidia-96xx-kmod.spec 
Added Files:
	drop24support.patch 
Log Message:
* Sat Sep 15 2012 Leigh Scott <leigh123linux at googlemail.com> - 96.43.23-1
- Update to 96.43.23


drop24support.patch:
 Makefile.kbuild |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE drop24support.patch ---
Index: b/Makefile.kbuild
===================================================================
--- a/usr/src/nv/Makefile.kbuild	2012-05-23 14:18:51.626083727 +0200
+++ b/usr/src/nv/Makefile.kbuild	2012-05-23 14:21:11.225207973 +0200
@@ -139,11 +139,11 @@
 # module extension. Handle these gracefully.
 #
 
-ifeq ($(PATCHLEVEL), 4)
+ifeq (xxx$(PATCHLEVEL), 4)
  MODULE_OBJECT := $(MODULE_NAME).o
 else
  MODULE_OBJECT := $(MODULE_NAME).ko
 endif
 
 #
 # NVIDIA specific CFLAGS and #define's. The remap_page_range check has become
@@ -164,7 +164,7 @@
  EXTRA_CFLAGS += -DDEBUG -g 
 endif
 
-ifneq ($(PATCHLEVEL), 4)
+ifneq (xxx$(PATCHLEVEL), 4)
  COMPILE_TESTS = \
 	remap_page_range \
 	remap_pfn_range \
@@ -228,7 +228,7 @@
 # More quirks for Linux 2.4 KBUILD, which doesn't link automatically.
 #
 
-ifeq ($(PATCHLEVEL), 4)
+ifeq (xxx$(PATCHLEVEL), 4)
 $(obj)/$(MODULE_NAME).o: $($(MODULE_NAME)-objs)
 	$(LD) $(EXTRA_LDFLAGS) -r -o $@ $($(MODULE_NAME)-objs)
 endif
@@ -328,6 +328,6 @@
 # includes dependencies automatically.
 #
 
-ifeq ($(PATCHLEVEL), 4)
+ifeq (xxx$(PATCHLEVEL), 4)
 include $(KERNEL_SOURCES)/Rules.make
 endif


Index: nvidia-96xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-96xx-kmod/F-16/nvidia-96xx-kmod.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- nvidia-96xx-kmod.spec	15 Sep 2012 12:47:58 -0000	1.36
+++ nvidia-96xx-kmod.spec	15 Sep 2012 13:33:44 -0000	1.37
@@ -21,6 +21,7 @@
 Source0:       http://rpms.kwizart.net/fedora/SOURCES/nvidia-kmod-data-%{version}.tar.bz2
 #Source0:       http://www.diffingo.com/downloads/livna/kmod-data/nvidia-kmod-data-%{version}.tar.bz2
 # </switch me>
+Patch0:        drop24support.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,12 +45,12 @@
 %setup -q -c -T -a 0
 
 # patch loop
-#for arch in x86 x64
-#do
-#    pushd nvidiapkg-${arch}
-# empty
-#    popd
-#done
+for arch in x86 x64
+do
+    pushd nvidiapkg-${arch}
+%patch1 -p1
+    popd
+done
 
 
 for kernel_version  in %{?kernel_versions} ; do