rpms/rt2870-kmod/F-9 rt2870-no2.4-in-kernelversion.patch, NONE, 1.1 rt2870-kmod.spec, 1.23, 1.24

[Orcan Ogetbil]

Author: oget

Update of /cvs/free/rpms/rt2870-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1154

Modified Files:
	rt2870-kmod.spec 
Added Files:
	rt2870-no2.4-in-kernelversion.patch 
Log Message:
* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-2
- Bugfix: kmod doesn't compile when the kernel version has a "2.4" substring


rt2870-no2.4-in-kernelversion.patch:

--- NEW FILE rt2870-no2.4-in-kernelversion.patch ---
diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk
--- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk	2009-03-10 00:47:50.000000000 -0400
+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk	2009-03-26 01:57:12.000000000 -0400
@@ -236,14 +236,14 @@ export CFLAGS
 endif
 
 ifeq ($(PLATFORM),PC)
-    ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+	#    ifneq (,$(findstring 2.4,$(LINUX_SRC)))
 	# Linux 2.4
-	CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h $(WFLAGS)
-	export CFLAGS
-    else
+	#	CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h $(WFLAGS)
+	#	export CFLAGS
+	#    else
 	# Linux 2.6
 	EXTRA_CFLAGS := $(WFLAGS) -I$(RT28xx_DIR)/include
-    endif
+	#    endif
 endif
 
 ifeq ($(PLATFORM),IXP)


Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-9/rt2870-kmod.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rt2870-kmod.spec	26 Mar 2009 05:41:39 -0000	1.23
+++ rt2870-kmod.spec	26 Mar 2009 06:13:03 -0000	1.24
@@ -3,11 +3,11 @@
 # "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
 
 Name:		rt2870-kmod
 Version:	2.1.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Kernel module for wireless devices with Ralink's rt2870 chipsets
 
 Group:		System Environment/Kernel
@@ -15,6 +15,7 @@
 URL:		http://www.ralinktech.com/ralink/Home/Support/Linux.html
 Source0:	http://www.ralinktech.com.tw/data/drivers/2009_0302_RT2870_Linux_STA_v2.1.0.0.tar.bz2
 Source11:	rt2870-kmodtool-excludekernel-filterfile
+Patch1:		rt2870-no2.4-in-kernelversion.patch
 Patch2:		rt2870-Makefile.x-fixes.patch
 Patch3:		rt2870-NetworkManager-support.patch
 Patch4:		rt2870-strip-tftpboot-copy.patch
@@ -44,6 +45,7 @@
 
 %setup -q -c -T -a 0
 
+%patch1 -p0 -b .no24
 %patch2 -p0 -b .rpmbuild
 %patch3 -p0 -b .NetworkManager
 %patch4 -p0 -b .tftpboot
@@ -76,6 +78,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-2
+- Bugfix: kmod doesn't compile when the kernel version has a "2.4" substring
+
 * Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-1
 - New upstream version
 - Drop additional-devices patch since it is upstreamed