dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xsupplicant
-# $Id$
-NAME := xsupplicant
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-f66c49cd6e4f331d05bf83513ed91990  xsupplicant-1.2.7.tar.gz
+75f89731b905eb8d36a52621661e1226  xsupplicant-1.2.8.tar.gz

xsupplicant-1.2.8-nocompilerh-systemheaders.patch

@@ -0,0 +1,48 @@
+diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c
+--- xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c	2006-10-08 05:42:53.000000000 +0200
++++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c	2006-11-21 10:11:17.000000000 +0100
+@@ -103,7 +103,6 @@
+ #include <sys/ioctl.h>
+ #include <linux/types.h>
+ #include <linux/socket.h>
+-#include <linux/compiler.h>
+ #include <iwlib.h>
+ #include <stdlib.h>
+ #include <string.h>
+Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_atmel_driver.c~
+diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c
+--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c	2006-10-08 05:42:53.000000000 +0200
++++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c	2006-11-21 10:11:08.000000000 +0100
+@@ -174,7 +174,6 @@
+ #include <netinet/in.h>
+ #include <linux/types.h>
+ #include <linux/socket.h>
+-#include <linux/compiler.h>
+ #include <iwlib.h>
+ #include <linux/if_packet.h>
+ #include <stdio.h>
+Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux.c~
+diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c
+--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c	2006-10-08 05:42:53.000000000 +0200
++++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c	2006-11-21 10:11:37.000000000 +0100
+@@ -203,7 +203,6 @@
+ 
+ #include <unistd.h>
+ #include <sys/socket.h>
+-#include <linux/compiler.h>
+ #include <iwlib.h>
+ #include <sys/ioctl.h>
+ #include "netlink.h"
+Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_rtnetlink.c~
+diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c
+--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c	2006-10-08 05:42:53.000000000 +0200
++++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c	2006-11-21 10:11:28.000000000 +0100
+@@ -203,7 +203,6 @@
+ #include <netinet/in.h>
+ #include <linux/types.h>
+ #include <linux/socket.h>
+-#include <linux/compiler.h>
+ #include <linux/wireless.h>
+ #include <iwlib.h>
+ #include <linux/if_packet.h>
+Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_wext.c~

xsupplicant.spec

@@ -1,8 +1,8 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.7
-Release:	3%{?dist}
-License:	GPL
+Version:	1.2.8
+Release:	1%{?dist}.1
+License:	GPLv2+
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
 Source0:	http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz
@@ -11,8 +11,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openssl-devel, bison, flex, openjade, lynx, jadetex
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools-devel
 Patch0:		xsupplicant-1.2.2-docsfix.patch
-Patch2:		xsupplicant-1.2.7-nocompilerh-systemheaders.patch
-Patch3:		xsupplicant-1.2.7-ducttapefixes.patch
+Patch2:		xsupplicant-1.2.8-nocompilerh-systemheaders.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -32,7 +31,6 @@ Development libraries and headers for xsupplicant.
 %setup -q
 %patch0 -p1
 %patch2 -p1
-%patch3 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -73,6 +71,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libxsup*.a
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway <tcallawa@redhat.com> 1.2.8-1
+- everyone gets 1.2.8, close out bz 212700
+
+* Tue Nov 21 2006 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> 1.2.8-0
+- update to 1.2.8
+- removed xsupplicant-1.2.7-ducttapefixes.patch
+- updated nocompilerh patch for latest version
+
 * Sun Sep 10 2006 Tom "spot" Callaway <tcallawa@redhat.com> 1.2.7-3
 - fix ducttape patch for FC-4/FC-5