rpms/gkrellm-wifi/devel gkrellm-wifi-0.9.12-kernel-2.6.26.patch, NONE, 1.1 gkrellm-wifi.spec, 1.6, 1.7

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/gkrellm-wifi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21642

Modified Files:
	gkrellm-wifi.spec 
Added Files:
	gkrellm-wifi-0.9.12-kernel-2.6.26.patch 
Log Message:
* Sat May 31 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.12-8
- Fix compiling with mix of latest glibc + kernel headers (avoid header
  conflict)


gkrellm-wifi-0.9.12-kernel-2.6.26.patch:

--- NEW FILE gkrellm-wifi-0.9.12-kernel-2.6.26.patch ---
diff -up gkrellm-wifi-0.9.12/gkrellm-wifi-linux.c~ gkrellm-wifi-0.9.12/gkrellm-wifi-linux.c
--- gkrellm-wifi-0.9.12/gkrellm-wifi-linux.c~	2008-05-31 16:05:33.000000000 +0200
+++ gkrellm-wifi-0.9.12/gkrellm-wifi-linux.c	2008-05-31 16:05:33.000000000 +0200
@@ -29,7 +29,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include <net/if.h>
+/* #include <net/if.h> */
 #include <asm/types.h>
 #include <linux/wireless.h>
 


Index: gkrellm-wifi.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-wifi/devel/gkrellm-wifi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gkrellm-wifi.spec	19 Feb 2008 08:25:53 -0000	1.6
+++ gkrellm-wifi.spec	31 May 2008 14:15:32 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gkrellm-wifi
 Version:        0.9.12
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Wireless monitor plugin for the GNU Krell Monitors
 Group:          Applications/System
 License:        GPLv2+
@@ -9,6 +9,7 @@
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         %{name}-%{version}.patch
 Patch1:         gkrellm-wifi-0.9.12-asm_h.patch
+Patch2:         gkrellm-wifi-0.9.12-kernel-2.6.26.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gkrellm-devel
 Requires:       gkrellm >= 2.2, gkrellm < 3
@@ -28,6 +29,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1 -z .asm_h
+%patch2 -p1
 
 
 %build
@@ -52,6 +54,10 @@
 
 
 %changelog
+* Sat May 31 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.12-8
+- Fix compiling with mix of latest glibc + kernel headers (avoid header
+  conflict)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.12-7
 - Autorebuild for GCC 4.3