rpms/xsupplicant/devel xsupplicant-2.1.8-ui-Fedora.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.11, 1.12 xsupplicant.spec, 1.43, 1.44 xsupplicant-2.1.7-fix-configure.patch, 1.1, NONE xsupplicant-2.1.7-sim-fixes.patch, 1.1, NONE xsupplicant-2.1.7-tnc.patch, 1.1, NONE xsupplicant-2.1.7-ui-Fedora.patch, 1.1, NONE xsupplicant-2.1.7-ui-fixes.patch, 1.1, NONE

[Tom Callaway]

Author: spot

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

Modified Files:
	.cvsignore sources xsupplicant.spec 
Added Files:
	xsupplicant-2.1.8-ui-Fedora.patch 
Removed Files:
	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.8

xsupplicant-2.1.8-ui-Fedora.patch:
 FormLoader.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xsupplicant-2.1.8-ui-Fedora.patch ---
diff -up XSupplicant-2.1.8-src/xsupplicant-ui/xsupptray/FormLoader.cpp.Fedora XSupplicant-2.1.8-src/xsupplicant-ui/xsupptray/FormLoader.cpp
--- XSupplicant-2.1.8-src/xsupplicant-ui/xsupptray/FormLoader.cpp.Fedora	2009-04-22 01:13:04.000000000 -0400
+++ XSupplicant-2.1.8-src/xsupplicant-ui/xsupptray/FormLoader.cpp	2009-09-02 12:40:38.329916230 -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__
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsupplicant/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	14 May 2009 21:06:34 -0000	1.8
+++ .cvsignore	2 Sep 2009 16:55:48 -0000	1.9
@@ -1 +1 @@
-xsupplicant-2.1.7.zip
+XSupplicant-2.1.8-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsupplicant/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	14 May 2009 21:06:34 -0000	1.11
+++ sources	2 Sep 2009 16:55:48 -0000	1.12
@@ -1 +1 @@
-d92d4ed7f2f6f3e91e7b29553daa4b5a  xsupplicant-2.1.7.zip
+390e45630f06ac0efa88049fa8c5f16f  XSupplicant-2.1.8-src.tar.gz


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- xsupplicant.spec	21 Aug 2009 16:37:15 -0000	1.43
+++ xsupplicant.spec	2 Sep 2009 16:55:48 -0000	1.44
@@ -1,17 +1,13 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	2.1.7
-Release:	3%{?dist}
+Version:	2.1.8
+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}.zip
+Source0:	http://download.sourceforge.net/open1x/XSupplicant-%{version}-src.tar.gz
 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
+Patch2:		xsupplicant-2.1.8-ui-Fedora.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool, dos2unix, libxml2-devel, pcsc-lite-devel, libtnc-devel
 BuildRequires:	openssl-devel, wireless-tools-devel
@@ -42,17 +38,10 @@ Requires:	%{name} = %{version}-%{release
 QT User Interface for XSupplicant.
 
 %prep
-%setup -q
-%patch0 -p1 -b .tnc
-%patch1 -p1 -b .ui
+%setup -q -n XSupplicant-%{version}-src
 # 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
@@ -61,7 +50,7 @@ pushd xsupplicant
 make %{?_smp_mflags}
 popd
 pushd xsupplicant-ui/xsupptray
-qmake-qt4
+qmake-qt4 XSupplicantUI-unix.pro
 make %{?_smp_mflags}
 popd
 
@@ -133,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 
 %changelog
+* Wed Sep  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.8-1
+- update to 2.1.8
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.7-3
 - rebuilt with new openssl
 


--- xsupplicant-2.1.7-fix-configure.patch DELETED ---


--- xsupplicant-2.1.7-sim-fixes.patch DELETED ---


--- xsupplicant-2.1.7-tnc.patch DELETED ---


--- xsupplicant-2.1.7-ui-Fedora.patch DELETED ---


--- xsupplicant-2.1.7-ui-fixes.patch DELETED ---