rpms/wlassistant/devel wlassistant-0.5.5-rpath.patch, NONE, 1.1 sources, 1.2, 1.3 wlassistant.spec, 1.2, 1.3

Tom Callaway (spot) fedora-extras-commits at redhat.com
Wed Mar 1 01:11:31 UTC 2006


Author: spot

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

Modified Files:
	sources wlassistant.spec 
Added Files:
	wlassistant-0.5.5-rpath.patch 
Log Message:

scons annoys me. bumping to 0.5.5


wlassistant-0.5.5-rpath.patch:

--- NEW FILE wlassistant-0.5.5-rpath.patch ---
--- wlassistant-0.5.5/bksys/kde.py.BAD	2006-02-28 19:00:25.000000000 -0600
+++ wlassistant-0.5.5/bksys/kde.py	2006-02-28 19:01:14.000000000 -0600
@@ -25,10 +25,7 @@
 		lenv.Append( CPPFLAGS = '-DQT_NO_TRANSLATION' )
 	if 'rpath' in _flags:
 		## Use this to set rpath - this may cause trouble if folders are moved (chrpath)
-		kdelibpaths=[]
-		if lenv['KDELIBPATH'] == lenv['KDELIB']: kdelibpaths = [lenv['KDELIB']]
-		else: kdelibpaths = [lenv['KDELIBPATH'],  lenv['KDELIB']]
-		lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']]+kdelibpaths )
+		lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']] )
 	if 'thread' in _flags:
 		## Uncomment the following if you need threading support
 		lenv.KDEaddflags_cxx( ['-DQT_THREAD_SUPPORT', '-D_REENTRANT'] )


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wlassistant/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Sep 2005 20:52:54 -0000	1.2
+++ sources	1 Mar 2006 01:11:30 -0000	1.3
@@ -1 +1 @@
-4836d595a27f34c24784cdf9c2a9d5a8  wlassistant-0.5.4a.tar.bz2
+1f30f1384b03662a9a0b75fa777f21d6  wlassistant-0.5.5.tar.bz2


Index: wlassistant.spec
===================================================================
RCS file: /cvs/extras/rpms/wlassistant/devel/wlassistant.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wlassistant.spec	17 Sep 2005 21:31:56 -0000	1.2
+++ wlassistant.spec	1 Mar 2006 01:11:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		wlassistant
-Version:	0.5.4a
-Release:	3%{?dist}
+Version:	0.5.5
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Wireless network management tool
@@ -10,11 +10,12 @@
 Source2:	wlassistant.pamd
 Source3:	wlassistant.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	kdebase-devel, desktop-file-utils, wireless-tools
+BuildRequires:	kdebase-devel, desktop-file-utils, wireless-tools, scons
+BuildRequires:	qt-devel
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:       usermode, wireless-tools, net-tools, dhclient
-Patch0:		wlassistant-0.5.4a-rpath.patch
+Patch0:		wlassistant-0.5.5-rpath.patch
 
 %description
 Wireless Assistant (wlassistant) is a small application that allows you to 
@@ -32,7 +33,9 @@
 %patch0 -p1
 
 %build
-%configure
+PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"`
+sed -i "s|'-O2'|[$PARSED_OPT_FLAGS]|" bksys/generic.py
+./configure
 make %{?_smp_mflags}
 
 %install
@@ -71,7 +74,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README NEWS ChangeLog
+%doc doc/AUTHORS doc/COPYING doc/README doc/NEWS doc/TODO ChangeLog
 %config(noreplace) %{_sysconfdir}/pam.d/wlassistant
 %config(noreplace) %{_sysconfdir}/security/console.apps/wlassistant
 %{_bindir}/wlassistant
@@ -81,6 +84,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.5-1
+- bump to 0.5.5
+
 * Sat Sep 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.4a-3
 - use .desktop file as SOURCE3 rather than screwing around with dos2unix
 




More information about the fedora-extras-commits mailing list