rpms/xsupplicant/devel XSupplicantUI.desktop, NONE, 1.1 xsupplicant-2.1.7-fix-configure.patch, NONE, 1.1 xsupplicant-2.1.7-sim-fixes.patch, NONE, 1.1 xsupplicant-2.1.7-tnc.patch, NONE, 1.1 xsupplicant-2.1.7-ui-Fedora.patch, NONE, 1.1 xsupplicant-2.1.7-ui-fixes.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.10, 1.11 xsupplicant.spec, 1.40, 1.41

Tom Callaway spot at fedoraproject.org
Thu May 14 21:06:34 UTC 2009 

Author: spot

Update of /cvs/extras/rpms/xsupplicant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19956

Modified Files:
	.cvsignore sources xsupplicant.spec 
Added Files:
	XSupplicantUI.desktop xsupplicant-2.1.7-fix-configure.patch 
	xsupplicant-2.1.7-sim-fixes.patch xsupplicant-2.1.7-tnc.patch 
	xsupplicant-2.1.7-ui-Fedora.patch 
	xsupplicant-2.1.7-ui-fixes.patch 
Log Message:
update to 2.1.7


--- NEW FILE XSupplicantUI.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=XSupplicantUI
GenericName=XSupplicant User Interface
Exec=/usr/bin/XSupplicantUI
Icon=XSupplicantUI
Terminal=false
Type=Application
Categories=Network;

xsupplicant-2.1.7-fix-configure.patch:

--- NEW FILE xsupplicant-2.1.7-fix-configure.patch ---
diff -up xsupplicant-2.1.7/xsupplicant/configure.ac.fix-configure xsupplicant-2.1.7/xsupplicant/configure.ac
--- xsupplicant-2.1.7/xsupplicant/configure.ac.fix-configure	2009-05-14 15:47:16.564526622 -0400
+++ xsupplicant-2.1.7/xsupplicant/configure.ac	2009-05-14 15:48:12.352777331 -0400
@@ -227,8 +227,10 @@ AS_IF([test "$enable_eap_sim" = yes],
   [ AC_DEFINE(EAP_SIM_ENABLE)
     AC_MSG_CHECKING([for libpcsclite])
     if `pkg-config libpcsclite --exists`; then
-      LIBS=`pkg-config libpcsclite --libs $LIBS`
-      AM_CPPFLAGS=`pkg-config libpcsclite --cflags $AM_CPPFLAGS`
+      PCSCLIBS=`pkg-config libpcsclite --libs`
+      LIBS="$PCSCLIBS $LIBS"
+      PCSCFLAGS=`pkg-config libpcsclite --cflags`
+      AM_CPPFLAGS="$PCSCFLAGS $AM_CPPFLAGS"
     else
       AC_MSG_ERROR([libpcsclite is required to use EAP-SIM/AKA support. If you believe that you have it, but it isn't being located, you may want to set the PKG_CONFIG_PATH to point to the location of libpcsclite.pc.])
     fi],
@@ -242,8 +244,10 @@ AS_IF([test "$enable_parser_debug" = yes
 
 AC_MSG_CHECKING([for libxml-2.0])
 if `pkg-config libxml-2.0 --exists`; then
-     LIBS=`pkg-config libxml-2.0 --libs $LIBS`
-     AM_CPPFLAGS=`pkg-config libxml-2.0 --cflags $AM_CPPFLAGS`
+     XML2LIBS=`pkg-config libxml-2.0 --libs`
+     LIBS="$XML2LIBS $LIBS"
+     XML2FLAGS=`pkg-config libxml-2.0 --cflags`
+     AM_CPPFLAGS="$XML2FLAGS $AM_CPPFLAGS"
      AC_MSG_RESULT([found with pkg-config])
 elif test -e /usr/lib/libxml2.dylib; then
      dnl Mac OS X doesn't have pkg-config.  So check in the defaut location.
@@ -416,7 +420,7 @@ AM_CONDITIONAL([DARWIN],  [test "$platfo
 AM_CONDITIONAL([WINDOWS], [test "$platform" = windows])
 
 CFLAGS="$GGDBFLAGS $CFLAGS"
-AM_CPPFLAGS="$AM_CPPFLAGS "'-I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/src'
+AM_CPPFLAGS="$AM_CPPFLAGS "'-I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/../lib -I${top_srcdir}/src -I${top_srcdir}/../src'
 
 AC_SUBST(MORELIBS)
 AC_SUBST(DARWINLIBS)

xsupplicant-2.1.7-sim-fixes.patch:

--- NEW FILE xsupplicant-2.1.7-sim-fixes.patch ---
diff -up xsupplicant-2.1.7/xsupplicant/src/eap_types/aka/aka.c.fix-sim xsupplicant-2.1.7/xsupplicant/src/eap_types/aka/aka.c
--- xsupplicant-2.1.7/xsupplicant/src/eap_types/aka/aka.c.fix-sim	2009-04-23 14:38:32.000000000 -0400
+++ xsupplicant-2.1.7/xsupplicant/src/eap_types/aka/aka.c	2009-05-14 16:39:43.364776218 -0400
@@ -31,7 +31,7 @@
 #include <openssl/sha.h>
 
 #include "winscard.h"
-#include "xsupconfig.h"
+#include "libxsupconfig/xsupconfig.h"
 #include "../../context.h"
 #include "../../xsup_common.h"
 #include "../../eap_sm.h"
diff -up xsupplicant-2.1.7/xsupplicant/src/eap_types/aka/eapaka.c.fix-sim xsupplicant-2.1.7/xsupplicant/src/eap_types/aka/eapaka.c
--- xsupplicant-2.1.7/xsupplicant/src/eap_types/aka/eapaka.c.fix-sim	2009-03-12 12:47:18.000000000 -0400
+++ xsupplicant-2.1.7/xsupplicant/src/eap_types/aka/eapaka.c	2009-05-14 16:39:43.364776218 -0400
@@ -21,6 +21,7 @@
 #ifndef WINDOWS
 #include <inttypes.h>
 #include <unistd.h>
+#define _snprintf snprintf
 #else
 #include "../../stdintwin.h"
 #endif
@@ -32,7 +33,7 @@
 #include <stdlib.h>
 
 #include "winscard.h"
-#include "xsupconfig.h"
+#include "libxsupconfig/xsupconfig.h"
 #include "../../context.h"
 #include "../../xsup_common.h"
 #include "../../eap_sm.h"
diff -up xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/eapsim.c.fix-sim xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/eapsim.c
--- xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/eapsim.c.fix-sim	2009-04-20 13:14:32.000000000 -0400
+++ xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/eapsim.c	2009-05-14 16:39:43.365776485 -0400
@@ -21,6 +21,7 @@
 #ifndef WINDOWS
 #include <inttypes.h>
 #include <unistd.h>
+#define _snprintf snprintf
 #else
 #include <windows.h>
 #include "../../stdintwin.h"
diff -up xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/sim.c.fix-sim xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/sim.c
--- xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/sim.c.fix-sim	2009-03-12 12:47:18.000000000 -0400
+++ xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/sim.c	2009-05-14 16:39:43.365776485 -0400
@@ -33,7 +33,7 @@
 #include <openssl/hmac.h>
 
 #include "winscard.h"
-#include "xsupconfig.h"
+#include "libxsupconfig/xsupconfig.h"
 #include "../../context.h"
 #include "../../xsup_common.h"
 #include "../../eap_sm.h"
diff -up xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/simd11.c.fix-sim xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/simd11.c
--- xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/simd11.c.fix-sim	2009-03-12 12:47:18.000000000 -0400
+++ xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/simd11.c	2009-05-14 16:39:43.365776485 -0400
@@ -29,7 +29,7 @@
 #include <openssl/hmac.h>
 
 #include "winscard.h"
-#include "xsupconfig.h"
+#include "libxsupconfig/xsupconfig.h"
 #include "../../context.h"
 #include "../../xsup_common.h"
 #include "../../eap_sm.h"
diff -up xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/simd5.c.fix-sim xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/simd5.c
--- xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/simd5.c.fix-sim	2009-03-12 12:47:18.000000000 -0400
+++ xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/simd5.c	2009-05-14 16:39:43.366776054 -0400
@@ -29,7 +29,8 @@
 #include <openssl/hmac.h>
 
 #include "winscard.h"
-#include "xsupconfig.h"
+#include "libxsupconfig/xsupconfig.h"
+#include "xsup_common.h"
 #include "../../context.h"
 #include "../../eap_sm.h"
 #include "eapsim.h"
diff -up xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/sim_reader_plugin_hook.c.fix-sim xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/sim_reader_plugin_hook.c
--- xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/sim_reader_plugin_hook.c.fix-sim	2009-04-13 16:56:12.000000000 -0400
+++ xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/sim_reader_plugin_hook.c	2009-05-14 16:44:30.398777116 -0400
@@ -8,11 +8,13 @@
 * \author chris at open1x.org
 *
 **/  
+#ifdef EAP_SIM_ENABLE
 
 #ifdef WINDOWS
 #include <windows.h>
 #endif	
 
+#include <string.h>
 #include <winscard.h>
 
 #include "../../lib/libxsupconfig/xsupconfig.h"
@@ -528,4 +530,4 @@ int sim_reader_plugin_hook_wait_card_rea
 	return -1;
 }
 
-
+#endif
diff -up xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/sm_handler.c.fix-sim xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/sm_handler.c
--- xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/sm_handler.c.fix-sim	2009-05-07 16:08:20.000000000 -0400
+++ xsupplicant-2.1.7/xsupplicant/src/eap_types/sim/sm_handler.c	2009-05-14 16:39:43.366776054 -0400
@@ -77,8 +77,11 @@
 #ifndef WINDOWS
 #include <strings.h>
 #include <unistd.h>
+#define _snprintf snprintf
 #endif
 
+#include "xsup_common.h"
+
 #include <stdlib.h>
 
 #include "../../xsup_debug.h"
diff -up xsupplicant-2.1.7/xsupplicant/src/Makefile.am.fix-sim xsupplicant-2.1.7/xsupplicant/src/Makefile.am
--- xsupplicant-2.1.7/xsupplicant/src/Makefile.am.fix-sim	2009-05-14 16:39:43.346776789 -0400
+++ xsupplicant-2.1.7/xsupplicant/src/Makefile.am	2009-05-14 16:39:43.367776321 -0400
@@ -89,6 +89,7 @@ xsupplicant_SOURCES = backend_sm.h confi
 			eap_types/sim/sha1.c eap_types/sim/sim.c \
 			eap_types/sim/simd11.c eap_types/sim/simd5.c \
 			eap_types/sim/sm_handler.c \
+			eap_types/sim/sim_reader_plugin_hook.c \
 			eap_types/aka/eapaka.c eap_types/aka/aka.c \
 			eap_types/eap_type_common.c \
 			eap_types/fast/eapfast.c eap_types/fast/eapfast_xml.c \

xsupplicant-2.1.7-tnc.patch:

--- NEW FILE xsupplicant-2.1.7-tnc.patch ---
diff -up xsupplicant-2.1.7/xsupplicant/configure.ac.tnc xsupplicant-2.1.7/xsupplicant/configure.ac
--- xsupplicant-2.1.7/xsupplicant/configure.ac.tnc	2009-05-04 17:16:44.000000000 -0400
+++ xsupplicant-2.1.7/xsupplicant/configure.ac	2009-05-12 18:11:58.903848144 -0400
@@ -196,7 +196,7 @@ AS_IF([test "$enable_experimental" = yes
 dnl check for tnc
 AS_IF([test "$enable_tnc" = yes],
   [ AC_CHECK_HEADER(libtnc.h,
-      [ MORELIBS="$MORELIBS -ltnc" ],
+      [ TNCLIB="-ltnc" ],
       AC_MSG_ERROR([The TNC library is required to use TNC support!]))
     AC_DEFINE(HAVE_TNC)],
   [])
@@ -421,6 +421,7 @@ AM_CPPFLAGS="$AM_CPPFLAGS "'-I${top_srcd
 AC_SUBST(MORELIBS)
 AC_SUBST(DARWINLIBS)
 AC_SUBST(CORELIBS)
+AC_SUBST(TNCLIB)
 AC_SUBST(MOREDEFS)
 AC_SUBST(LDFLAGS)
 AC_SUBST(AM_CPPFLAGS)
diff -up xsupplicant-2.1.7/xsupplicant/src/eap_types/tnc/tnc_compliance_funcs.c.tnc xsupplicant-2.1.7/xsupplicant/src/eap_types/tnc/tnc_compliance_funcs.c
--- xsupplicant-2.1.7/xsupplicant/src/eap_types/tnc/tnc_compliance_funcs.c.tnc	2009-03-25 17:48:00.000000000 -0400
+++ xsupplicant-2.1.7/xsupplicant/src/eap_types/tnc/tnc_compliance_funcs.c	2009-05-12 18:11:28.438076243 -0400
@@ -13,6 +13,7 @@
 
 #include <stdio.h>
 #include <libtnc.h>
+#include <libtnctncs.h>
 #include <tncifimc.h>
 
 #ifdef WINDOWS
@@ -536,4 +537,10 @@ XSUP_OUI_API TNC_UInt32 TNC_28383_TNCC_S
 	return event_core_register_ui_connect_callback(callback);
 }
 
+// Called by TNCS when a finished batch is ready to send
+TNC_UInt32 TNC_TNCS_SendBatch(libtnc_tncs_connection* conn, const char* messageBuffer, size_t messageLength)
+{
+	return libtnc_tncc_ReceiveBatch(conn, messageBuffer, messageLength);
+}
+
 #endif				//HAVE_TNC
diff -up xsupplicant-2.1.7/xsupplicant/src/Makefile.am.tnc xsupplicant-2.1.7/xsupplicant/src/Makefile.am
--- xsupplicant-2.1.7/xsupplicant/src/Makefile.am.tnc	2009-05-04 16:54:12.000000000 -0400
+++ xsupplicant-2.1.7/xsupplicant/src/Makefile.am	2009-05-12 18:11:28.438076243 -0400
@@ -96,4 +96,4 @@ xsupplicant_SOURCES = backend_sm.h confi
 			eap_types/tnc/tnc_compliance_funcs.c \
 			eap_types/tnc/tnc_compliance_callbacks.c
 			
-xsupplicant_LDADD = $(CORELIBS) $(MORELIBS) platform/libplatform.a
+xsupplicant_LDADD = $(CORELIBS) $(MORELIBS) $(TNCLIB) platform/libplatform.a

xsupplicant-2.1.7-ui-Fedora.patch:

--- NEW FILE xsupplicant-2.1.7-ui-Fedora.patch ---
diff -up xsupplicant-2.1.7/xsupplicant-ui/xsupptray/FormLoader.cpp.Fedora xsupplicant-2.1.7/xsupplicant-ui/xsupptray/FormLoader.cpp
--- xsupplicant-2.1.7/xsupplicant-ui/xsupptray/FormLoader.cpp.Fedora	2009-05-13 14:09:33.417777249 -0400
+++ xsupplicant-2.1.7/xsupplicant-ui/xsupptray/FormLoader.cpp	2009-05-13 14:10:13.779547797 -0400
@@ -82,7 +82,7 @@ QString FormLoader::skinpath()
 #ifdef __APPLE__
         return QString("/Library/Application Support/XSupplicant") + QString("/Skins/Default/");
 #else
-	return QApplication::applicationDirPath() + QString("/Skins/Default/");
+	return QString("/usr/share/xsupplicant/Skins/Default/");
 #endif // __APPLE__
 }
 

xsupplicant-2.1.7-ui-fixes.patch:

--- NEW FILE xsupplicant-2.1.7-ui-fixes.patch ---
diff -up xsupplicant-2.1.7/xsupplicant/lib/libxsupgui/xsupgui_events.h.BAD xsupplicant-2.1.7/xsupplicant/lib/libxsupgui/xsupgui_events.h
--- xsupplicant-2.1.7/xsupplicant/lib/libxsupgui/xsupgui_events.h.BAD	2009-05-13 13:34:35.002833320 -0400
+++ xsupplicant-2.1.7/xsupplicant/lib/libxsupgui/xsupgui_events.h	2009-05-13 13:37:50.353547437 -0400
@@ -12,6 +12,11 @@
 #ifndef __XSUPGUI_EVENTS_H__
 #define __XSUPGUI_EVENTS_H__
 
+#include <sys/types.h>
+#ifndef uint32_t
+typedef __uint32_t uint32_t;
+#endif
+
 #include <libxml/parser.h>
 
 #define XSUPGUI_EVENTS_LOG_LEVEL_NORMAL                    1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	4 Sep 2006 06:13:04 -0000	1.7
+++ .cvsignore	14 May 2009 21:06:34 -0000	1.8
@@ -1,6 +1 @@
-xsupplicant-1.2.tar.gz
-xsupplicant-1.2.2.tar.gz
-xsupplicant-1.2.3.tar.gz
-xsupplicant-1.2.4.tar.gz
-xsupplicant-1.2.6.tar.gz
-xsupplicant-1.2.7.tar.gz
+xsupplicant-2.1.7.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	21 Nov 2006 15:35:12 -0000	1.10
+++ sources	14 May 2009 21:06:34 -0000	1.11
@@ -1 +1 @@
-75f89731b905eb8d36a52621661e1226  xsupplicant-1.2.8.tar.gz
+d92d4ed7f2f6f3e91e7b29553daa4b5a  xsupplicant-2.1.7.zip


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- xsupplicant.spec	26 Feb 2009 12:07:52 -0000	1.40
+++ xsupplicant.spec	14 May 2009 21:06:34 -0000	1.41
@@ -1,18 +1,22 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.8
-Release:	10%{?dist}
-License:	GPLv2+
+Version:	2.1.7
+Release:	1%{?dist}
+License:	GPLv2+ or BSD with advertising
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
-Source0:	http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz
-# Source1:	v19wireless.h
+Source0:	http://download.sourceforge.net/open1x/xsupplicant-%{version}.zip
+Source1:	XSupplicantUI.desktop
+Patch0:		xsupplicant-2.1.7-tnc.patch
+Patch1:		xsupplicant-2.1.7-ui-fixes.patch
+Patch2:		xsupplicant-2.1.7-ui-Fedora.patch
+Patch3:		xsupplicant-2.1.7-fix-configure.patch
+Patch4:		xsupplicant-2.1.7-sim-fixes.patch
 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.8-nocompilerh-systemheaders.patch
-Patch3:		xsupplicant-1.2.8-iwlibfix.patch
+BuildRequires:	libtool, dos2unix, libxml2-devel, pcsc-lite-devel, libtnc-devel
+BuildRequires:	openssl-devel, wireless-tools-devel
+# UI BuildRequires:
+BuildRequires:	qt4-devel, desktop-file-utils
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -28,55 +32,110 @@ Requires:	%{name} = %{version}-%{release
 %description devel
 Development libraries and headers for xsupplicant.
 
+%package ui
+Summary:	Graphical User Interface for xsupplicant
+Group:		System Environment/Base
+License:	GPLv2
+Requires:	%{name} = %{version}-%{release}
+
+%description ui
+QT User Interface for XSupplicant.
+
 %prep
 %setup -q
-%patch0 -p1
-%patch2 -p1
-%patch3 -p1 -b .iwlib
-
-perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
+%patch0 -p1 -b .tnc
+%patch1 -p1 -b .ui
+# Find UI files in a sane system location
+%patch2 -p1 -b .Fedora
+# Fix configure
+%patch3 -p1 -b .fix-configure
+# Fix sim
+%patch4 -p1 -b .fix-sim
+cd xsupplicant
+dos2unix configure.ac Makefile.am
+autoreconf -vfis
 
 %build
-%configure
-# _smp_mflags makes this app go BOOM
-make
-# cd doc
-# ./builddocs.sh
-# cd ..
+pushd xsupplicant
+%configure --enable-tnc --enable-eap-fast --enable-eap-sim
+make %{?_smp_mflags}
+popd
+pushd xsupplicant-ui/xsupptray
+qmake-qt4
+make %{?_smp_mflags}
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
+pushd xsupplicant
 make DESTDIR=$RPM_BUILD_ROOT install
+popd
 
-install -D -m0600 etc/xsupplicant.conf $RPM_BUILD_ROOT%{_sysconfdir}/xsupplicant.conf
-
-# Multilib fix
-# touch -r README doc/pdf/Open1x-UserGuide.pdf
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+touch $RPM_BUILD_ROOT%{_sysconfdir}/xsupplicant.conf
+touch $RPM_BUILD_ROOT%{_sysconfdir}/xsupplicant.user.conf
+
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
+
+# ui bits
+pushd xsupplicant-ui
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/
+cp -a Skins $RPM_BUILD_ROOT%{_datadir}/%{name}/
+install -p build-debug/XSupplicantUI $RPM_BUILD_ROOT%{_bindir}
+popd
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+cp xsupplicant-ui/Skins/Default/icons/prod_color.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/XSupplicantUI.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files 
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README doc/README* etc/*.conf
-# %%doc doc/html/ doc/txt/ doc/pdf
-%config(noreplace) %{_sysconfdir}/xsupplicant.conf
+%doc xsupplicant/AUTHORS xsupplicant/COPYING 
+%doc xsupplicant/LICENSE xsupplicant/README 
+%doc xsupplicant/doc/README* 
+%doc xsupplicant/doc/extending_*
+%doc xsupplicant/doc/xsupplicant_eap*
+%doc xsupplicant/doc/Xsupplicant-wireless-cards.html
+%doc xsupplicant/etc/*.conf
+%config(noreplace) %ghost %{_sysconfdir}/xsupplicant.conf
+%config(noreplace) %ghost %{_sysconfdir}/xsupplicant.user.conf
+%{_bindir}/connect-tool
 %{_bindir}/config-parser
-%{_bindir}/xsup_monitor
+%{_bindir}/ipcevents
+%{_bindir}/ipctest
 %{_bindir}/xsup_ntpwdhash
-%{_bindir}/xsup_set_pwd
-%{_bindir}/xsup_get_state
 %{_sbindir}/xsupplicant
+%{_libdir}/libbirddog.so.*
+%{_libdir}/libsoftsim*.so.*
 
 %files devel
 %defattr(-,root,root,-)
+%doc xsupplicant/doc/standards/
 %{_includedir}/xsupconfcheck.h
 %{_includedir}/xsupconfig.h
-%{_includedir}/xsupconfwrite.h
 %{_includedir}/xsupgui.h
-%{_libdir}/libxsup*.a
+%{_includedir}/xsupgui_events.h
+%{_includedir}/xsupgui_events_state.h
+%{_libdir}/libbirddog.so
+%{_libdir}/libsoftsim*.so
+
+%files ui
+%defattr(-,root,root,-)
+%doc xsupplicant-ui/Doc/*.odt  xsupplicant-ui/Doc/*.pdf  xsupplicant-ui/Doc/*.txt
+%{_bindir}/XSupplicantUI
+%{_datadir}/applications/*.desktop
+%{_datadir}/pixmaps/XSupplicantUI.png
+%{_datadir}/%{name}/
 
 %changelog
+* Thu May 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.7-1
+- update to 2.1.7, drop static libs, add ui package
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

More information about the scm-commits mailing list