rpms/xsupplicant/devel xsupplicant-2.1.9-force-release.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.12, 1.13 xsupplicant.spec, 1.45, 1.46

[Tom Callaway]

Author: spot

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

Modified Files:
	.cvsignore sources xsupplicant.spec 
Added Files:
	xsupplicant-2.1.9-force-release.patch 
Log Message:
update to 2.1.9

xsupplicant-2.1.9-force-release.patch:
 XSupplicantUI-unix.pro |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE xsupplicant-2.1.9-force-release.patch ---
diff -up xsupplicant-src-2.1.9.709/xsupplicant-ui/xsupptray/XSupplicantUI-unix.pro.BAD xsupplicant-src-2.1.9.709/xsupplicant-ui/xsupptray/XSupplicantUI-unix.pro
--- xsupplicant-src-2.1.9.709/xsupplicant-ui/xsupptray/XSupplicantUI-unix.pro.BAD	2010-01-13 11:50:15.939273096 -0500
+++ xsupplicant-src-2.1.9.709/xsupplicant-ui/xsupptray/XSupplicantUI-unix.pro	2010-01-13 11:50:53.312370639 -0500
@@ -5,9 +5,9 @@
 
 TEMPLATE = app
 TARGET = XSupplicantUI
-DESTDIR = ../build-debug
+DESTDIR = ../build-release
 QT += xml
-CONFIG += debug
+CONFIG += release
 INCLUDEPATH += ./../../xsupplicant/src/eap_types/tnc \
     ./../../xsupplicant/lib \
     ./../../xsupplicant/lib/libsupdetect \
@@ -18,7 +18,7 @@ INCLUDEPATH += ./../../xsupplicant/src/e
     /usr/include/libxml2 \
     /usr/local/include \
     . \
-    ./debug \
+    ./release \
     ./GeneratedFiles
 LIBS += -L"./../../xsupplicant/lib/libsupdetect" \
     -L"./../../xsupplicant/lib/libxsupconfig" \
@@ -36,8 +36,8 @@ LIBS += -L"./../../xsupplicant/lib/libsu
     -lxsupconfcheck \
     -lsupdetect 
 DEPENDPATH += .
-MOC_DIR += debug
-OBJECTS_DIR += debug
+MOC_DIR += release
+OBJECTS_DIR += release
 UI_DIR += ./GeneratedFiles
 RCC_DIR += ./release
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsupplicant/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	2 Sep 2009 16:55:48 -0000	1.9
+++ .cvsignore	13 Jan 2010 16:59:21 -0000	1.10
@@ -1 +1 @@
-XSupplicant-2.1.8-src.tar.gz
+xsupplicant-src.2.1.9.709.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsupplicant/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	2 Sep 2009 16:55:48 -0000	1.12
+++ sources	13 Jan 2010 16:59:21 -0000	1.13
@@ -1 +1 @@
-390e45630f06ac0efa88049fa8c5f16f  XSupplicant-2.1.8-src.tar.gz
+30d818afab2f2a30dadbf69e7291c1c3  xsupplicant-src.2.1.9.709.tar.bz2


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- xsupplicant.spec	3 Sep 2009 00:23:23 -0000	1.45
+++ xsupplicant.spec	13 Jan 2010 16:59:22 -0000	1.46
@@ -1,14 +1,15 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	2.1.8
-Release:	2%{?dist}
+Version:	2.1.9
+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}-src.tar.gz
+Source0:	http://downloads.sourceforge.net/open1x/xsupplicant-src.%{version}.709.tar.bz2
 Source1:	XSupplicantUI.desktop
 Patch2:		xsupplicant-2.1.8-ui-Fedora.patch
 Patch3:		XSupplicant-2.1.8-ppc-fix.patch
+Patch4:		xsupplicant-2.1.9-force-release.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
@@ -39,11 +40,13 @@ Requires:	%{name} = %{version}-%{release
 QT User Interface for XSupplicant.
 
 %prep
-%setup -q -n XSupplicant-%{version}-src
+%setup -q -n xsupplicant-src-%{version}.709
 # Find UI files in a sane system location
 %patch2 -p1 -b .Fedora
 # Fix PPC (enough to get it building, not run-tested)
 %patch3 -p1 -b .ppc
+# Force the UI bits to be built as "release", not "debug"
+%patch4 -p1 -b .release
 cd xsupplicant
 autoreconf -vfis
 
@@ -74,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
 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}
+install -p build-release/XSupplicantUI $RPM_BUILD_ROOT%{_bindir}
 popd
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -125,6 +128,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 
 %changelog
+* Wed Jan 13 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.9-1
+- update to 2.1.9
+- force UI bits to be built with release, not debug
+
 * Wed Sep  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.8-2
 - duct tape fix for ppc/ppc64, not run-tested