rpms/ndiswrapper-kmod/devel ndiswrapper-1.56-redundant-define.patch, NONE, 1.1 ndiswrapper-kmod.spec, 1.41, 1.42

[Tristan Moody]

Author: swglasspit

Update of /cvs/free/rpms/ndiswrapper-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11339

Modified Files:
	ndiswrapper-kmod.spec 
Added Files:
	ndiswrapper-1.56-redundant-define.patch 
Log Message:
* Thu May 26 2011 Tristan Moody <tmoody [AT] ku [DOT] edu> - 1.56-1.1
- remove redundant defines that break build on new F-15 kernel


ndiswrapper-1.56-redundant-define.patch:
 pe_linker.h   |    2 +-
 winnt_types.h |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE ndiswrapper-1.56-redundant-define.patch ---
--- ndiswrapper-1.56/driver/winnt_types.h	2010-02-10 20:09:32.000000000 -0600
+++ ndiswrapper-1.56/driver/winnt_types.h	2011-05-26 03:36:46.496398169 -0500
@@ -138,7 +138,6 @@
 
 #endif
 
-#define packed __attribute__((packed))
 #define no_warn_unused __attribute__((unused))
 
 typedef u8	BOOLEAN;
--- ndiswrapper-1.56/driver/pe_linker.h	2010-02-10 20:09:32.000000000 -0600
+++ ndiswrapper-1.56/driver/pe_linker.h	2011-05-26 03:36:57.348262500 -0500
@@ -691,7 +691,7 @@
 
 /* Import module directory */
 
-typedef struct packed _IMAGE_IMPORT_DESCRIPTOR {
+typedef struct __packed _IMAGE_IMPORT_DESCRIPTOR {
 	union {
 		DWORD	Characteristics; /* 0 for terminating null
 					  * import descriptor */


Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/devel/ndiswrapper-kmod.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ndiswrapper-kmod.spec	13 Feb 2011 20:58:55 -0000	1.41
+++ ndiswrapper-kmod.spec	26 May 2011 09:17:22 -0000	1.42
@@ -23,6 +23,7 @@
 Patch6:         ndiswrapper-1.56-kernel-2.6.35-api-update-1.patch
 Patch7:         ndiswrapper-1.56-kernel-2.6.35-api-update-2.patch
 Patch8:         ndiswrapper-1.56-kernel-2.6.35-api-update-3.patch
+Patch9:         ndiswrapper-1.56-redundant-define.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # needed for plague to make sure it builds for i586 and i686
@@ -62,6 +63,7 @@
 %patch6 -p1 -b .kernel-2.6.35-api-update-1
 %patch7 -p1 -b .kernel-2.6.35-api-update-2
 %patch8 -p1 -b .kernel-2.6.35-api-update-3
+%patch9 -p1 -b .redundant-define
 #%patch0 -p2 -b .we_update
 #%patch1 -p1 -b .poll_controller
 )
@@ -91,8 +93,8 @@
 
 
 %changelog
-* Wed Dec 01 2010 Tristan Moody <tmoody [AT] ku [DOT] edu> - 1.56-1
-- update for new kernel-2.6.35 api that breaks 1.54 build
+* Thu May 26 2011 Tristan Moody <tmoody [AT] ku [DOT] edu> - 1.56-1.1
+- remove redundant defines that break build on new F-15 kernel
 
 * Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.54-4.15
 - rebuild for new kernel, disable i586 builds