rpms/xsupplicant/devel xsupplicant-1.2.8-iwlibfix.patch, NONE, 1.1 xsupplicant-1.2.2-docsfix.patch, 1.2, 1.3 xsupplicant.spec, 1.25, 1.26

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/xsupplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31989/devel

Modified Files:
	xsupplicant-1.2.2-docsfix.patch xsupplicant.spec 
Added Files:
	xsupplicant-1.2.8-iwlibfix.patch 
Log Message:

fix devel, license fixes for all


xsupplicant-1.2.8-iwlibfix.patch:

--- NEW FILE xsupplicant-1.2.8-iwlibfix.patch ---
diff -up xsupplicant-1.2.8/configure.in.BAD xsupplicant-1.2.8/configure.in
--- xsupplicant-1.2.8/configure.in.BAD	2007-08-06 11:05:57.000000000 -0400
+++ xsupplicant-1.2.8/configure.in	2007-08-06 11:06:24.000000000 -0400
@@ -119,6 +119,7 @@ if test $SYSTEM = "Linux"; then
    #ifndef __user
    #define __user
    #endif
+   #include <linux/if.h>
    #include <linux/wireless.h>])
 
    AC_MSG_CHECKING([iwlib version])
@@ -127,6 +128,7 @@ if test $SYSTEM = "Linux"; then
 		   #ifndef __user
 		   #define __user
 		   #endif
+                   #include <linux/if.h>
                    #include <linux/wireless.h>
                    #include <iwlib.h>], 
                [iw_extract_event_stream(NULL, NULL, 0);], [AC_DEFINE(NEW_IWLIB) AC_MSG_RESULT([3 params])], [AC_MSG_RESULT([2 params])])
diff -up xsupplicant-1.2.8/configure.BAD xsupplicant-1.2.8/configure
--- xsupplicant-1.2.8/configure.BAD	2007-08-06 11:07:06.000000000 -0400
+++ xsupplicant-1.2.8/configure	2007-08-06 11:06:54.000000000 -0400
@@ -4759,6 +4759,7 @@ cat >>conftest.$ac_ext <<_ACEOF
    #ifndef __user
    #define __user
    #endif
+   #include <linux/if.h>
    #include <linux/wireless.h>
 
 #include <$ac_header>
@@ -4823,6 +4824,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 		   #ifndef __user
 		   #define __user
 		   #endif
+                   #include <linux/if.h>
                    #include <linux/wireless.h>
                    #include <iwlib.h>
 int
diff -up xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c.BAD xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c.BAD	2007-08-06 11:19:02.000000000 -0400
+++ xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c	2007-08-06 11:19:10.000000000 -0400
@@ -203,6 +203,7 @@
 #include <netinet/in.h>
 #include <linux/types.h>
 #include <linux/socket.h>
+#include <linux/if.h>
 #include <linux/wireless.h>
 #include <iwlib.h>
 #include <linux/if_packet.h>

xsupplicant-1.2.2-docsfix.patch:

Index: xsupplicant-1.2.2-docsfix.patch
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant-1.2.2-docsfix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xsupplicant-1.2.2-docsfix.patch	4 Sep 2006 06:13:04 -0000	1.2
+++ xsupplicant-1.2.2-docsfix.patch	6 Aug 2007 15:39:34 -0000	1.3
@@ -4,7 +4,7 @@
  <?xml version="1.0" standalone="no"?>
  <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 -    "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-+    "/usr/share/sgml/docbook/xml-dtd-4.3-1.0-30.1/docbookx.dtd"
++    "/usr/share/sgml/docbook/xml-dtd-4.3-1.0-31/docbookx.dtd"
      [
        <!ENTITY chapter1 SYSTEM "chapter1.xml">
        <!ENTITY chapter2 SYSTEM "chapter2.xml">


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xsupplicant.spec	23 May 2007 04:52:44 -0000	1.25
+++ xsupplicant.spec	6 Aug 2007 15:39:34 -0000	1.26
@@ -1,8 +1,8 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.8
-Release:	2%{?dist}
-License:	GPL
+Release:	3%{?dist}
+License:	GPLv2+
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
 Source0:	http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz
@@ -12,6 +12,7 @@
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools-devel
 Patch0:		xsupplicant-1.2.2-docsfix.patch
 Patch2:		xsupplicant-1.2.8-nocompilerh-systemheaders.patch
+Patch3:		xsupplicant-1.2.8-iwlibfix.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -31,6 +32,7 @@
 %setup -q
 %patch0 -p1
 %patch2 -p1
+%patch3 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -71,6 +73,11 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Mon Aug  6 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.8-3
+- fix xsupplicant to compile in devel (needs linux/if.h)
+- fix doc generation
+- fix license
+
 * Wed May 23 2007 Christopher Aillon <caillon at redhat.com> 1.2.8-2
 - Rebuild against newer libiw.so