rpms/ndiswrapper-kmod/F-18 3.7_kernel.patch, NONE, 1.1 ndiswrapper-kmod.spec, 1.60, 1.61

[Leigh Scott]

Author: leigh123linux

Update of /cvs/free/rpms/ndiswrapper-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12619

Modified Files:
	ndiswrapper-kmod.spec 
Added Files:
	3.7_kernel.patch 
Log Message:
* Tue Jan 08 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.58-0.2rc1
- patched and rebuilt for 3.7 kernel


3.7_kernel.patch:
 Makefile     |    5 ++++-
 iw_ndis.c    |    4 ++++
 ntoskernel.h |   17 ++++-------------
 3 files changed, 12 insertions(+), 14 deletions(-)

--- NEW FILE 3.7_kernel.patch ---
Description: version.h is in a different location for 3.7
Author: Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>

--- a/driver/Makefile
+++ b/driver/Makefile
@@ -123,6 +123,9 @@
 OBJS += workqueue.o
 endif
 
+ifneq (,$(wildcard $(KBUILD)/include/generated/uapi/linux/version.h))
+EXTRA_CFLAGS += -DUAPI
+endif
 
 all: config_check modules
 
@@ -157,7 +160,7 @@
 
 
 config_check:
-	@if [ ! -f $(KBUILD)/include/linux/version.h ]; then \
+	@if [ ! -f $(KBUILD)/include/linux/version.h ] && [ ! -f $(KBUILD)/include/generated/uapi/linux/version.h ]; then \
 		echo; echo; \
 		echo "Cannot find kernel build files in $(KBUILD)"; \
 		echo "Please give the path to kernel build directory with" ; \
--- a/driver/ntoskernel.h
+++ b/driver/ntoskernel.h
@@ -36,7 +36,11 @@
 #include <linux/usb.h>
 #include <linux/spinlock.h>
 #include <asm/mman.h>
+#ifdef UAPI
+#include <generated/uapi/linux/version.h>
+#else
 #include <linux/version.h>
+#endif
 #include <linux/etherdevice.h>
 #include <net/iw_handler.h>
 #include <linux/ethtool.h>
@@ -204,19 +208,6 @@
 void wrap_cancel_work(struct work_struct *work);
 void wrap_flush_wq(struct workqueue_struct *workq);
 
-#else // WRAP_WQ
-
-/* Compatibility for Linux before 2.6.20 where INIT_WORK takes 3 arguments */
-#if !defined(INIT_WORK_NAR) && !defined(INIT_DELAYED_WORK_DEFERRABLE)
-typedef void (*compat_work_func_t)(void *work);
-typedef void (*work_func_t)(struct work_struct *work);
-static inline void (INIT_WORK)(struct work_struct *work, work_func_t func)
-{
-	INIT_WORK(work, (compat_work_func_t)func, work);
-}
-#undef INIT_WORK
-#endif
-
 #endif // WRAP_WQ
 
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)
--- a/driver/iw_ndis.c
+++ b/driver/iw_ndis.c
@@ -13,7 +13,11 @@
  *
  */
 
+#ifdef UAPI
+#include <generated/uapi/linux/version.h>
+#else
 #include <linux/version.h>
+#endif
 #include <linux/wireless.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>


Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-18/ndiswrapper-kmod.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ndiswrapper-kmod.spec	3 Jan 2013 22:48:27 -0000	1.60
+++ ndiswrapper-kmod.spec	8 Jan 2013 14:35:52 -0000	1.61
@@ -10,13 +10,14 @@
 Summary:	Ndiswrapper kernel module
 Name: 		ndiswrapper-kmod
 Version: 	1.58
-Release: 	0.1%{?pre}%{?dist}.5
+Release: 	0.2%{?pre}%{?dist}
 License: 	GPLv2
 Group: 		System Environment/Kernel
 URL:		http://ndiswrapper.sourceforge.net
 Source0: 	http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}%{?pre}.tar.gz
 Source11:	ndiswrapper-kmodtool-excludekernel-filterfile
 Patch0:		ndiswrapper-kmod-nomodinfo.patch
+Patch1:         3.7_kernel.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # needed for plague to make sure it builds for i586 and i686
@@ -48,6 +49,7 @@
 %setup -q -c -T -a 0 -n %{name}-%{version}%{?pre}
 (cd ndiswrapper-%{version}%{?pre} ; 
 %patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
 )
 sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?pre}/driver/Makefile
 for kernel_version  in %{?kernel_versions} ; do
@@ -75,6 +77,9 @@
 
 
 %changelog
+* Tue Jan 08 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.58-0.2rc1
+- patched and rebuilt for 3.7 kernel
+
 * Thu Jan 03 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.58-0.1rc1.5
 - Rebuilt for f18 final kernel