From eae6856c3e1beaa85869c4ea40a2a4a143a082d7 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 17 Sep 2005 21:31:55 +0000 Subject: [PATCH 1/6] Don't bother messing with the existing desktop file, use a known good copy. --- wlassistant.desktop | 12 ++++++++++++ wlassistant.spec | 15 ++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 wlassistant.desktop diff --git a/wlassistant.desktop b/wlassistant.desktop new file mode 100644 index 0000000..da99bc0 --- /dev/null +++ b/wlassistant.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Wireless Assistant +Comment[pl]=Program do obsługi sieci bezprzewodowych +Comment[es]=Aplicación para buscar redes inalámbricas +Comment=Application to look for wireless networks +Exec=/usr/sbin/wlassistant +Icon=/usr/share/icons/hicolor/32x32/apps/wlassistant.png +Type=Application +Categories=Application;SystemSetup;System; +StartupNotify=true + diff --git a/wlassistant.spec b/wlassistant.spec index b7f6b91..7045082 100644 --- a/wlassistant.spec +++ b/wlassistant.spec @@ -1,6 +1,6 @@ Name: wlassistant Version: 0.5.4a -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Summary: Wireless network management tool @@ -8,13 +8,13 @@ URL: http://wlassistant.sourceforge.net Source0: http://download.sourceforge.net/wlassistant/wlassistant-%{version}.tar.bz2 Source1: wlassistant.console_apps Source2: wlassistant.pamd +Source3: wlassistant.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdebase-devel, desktop-file-utils, dos2unix, wireless-tools +BuildRequires: kdebase-devel, desktop-file-utils, wireless-tools Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Requires: usermode, wireless-tools, net-tools, dhclient Patch0: wlassistant-0.5.4a-rpath.patch -Patch1: wlassistant-0.5.4a-desktopfix.patch %description Wireless Assistant (wlassistant) is a small application that allows you to @@ -30,7 +30,6 @@ MAIN FEATURES: %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %configure @@ -46,13 +45,12 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir} install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/wlassistant install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/wlassistant -dos2unix $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop +rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ - --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop + %{SOURCE3} %find_lang %{name} @@ -83,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* Sat Sep 17 2005 Tom "spot" Callaway 0.5.4a-3 +- use .desktop file as SOURCE3 rather than screwing around with dos2unix + * Sat Sep 17 2005 Tom "spot" Callaway 0.5.4a-2 - add BR: wireless-tools From 382a9eebf14bb8a56f5837a74ad7bbb5843619b1 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 1 Mar 2006 01:11:18 +0000 Subject: [PATCH 2/6] scons annoys me. bumping to 0.5.5 --- sources | 2 +- wlassistant-0.5.5-rpath.patch | 14 ++++++++++++++ wlassistant.spec | 18 ++++++++++++------ 3 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 wlassistant-0.5.5-rpath.patch diff --git a/sources b/sources index 58c3471..0935db7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4836d595a27f34c24784cdf9c2a9d5a8 wlassistant-0.5.4a.tar.bz2 +1f30f1384b03662a9a0b75fa777f21d6 wlassistant-0.5.5.tar.bz2 diff --git a/wlassistant-0.5.5-rpath.patch b/wlassistant-0.5.5-rpath.patch new file mode 100644 index 0000000..197c74f --- /dev/null +++ b/wlassistant-0.5.5-rpath.patch @@ -0,0 +1,14 @@ +--- 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'] ) diff --git a/wlassistant.spec b/wlassistant.spec index 7045082..e8061ac 100644 --- a/wlassistant.spec +++ b/wlassistant.spec @@ -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 @@ Source1: wlassistant.console_apps 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 @@ MAIN FEATURES: %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 @@ rm -rf $RPM_BUILD_ROOT %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 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 0.5.5-1 +- bump to 0.5.5 + * Sat Sep 17 2005 Tom "spot" Callaway 0.5.4a-3 - use .desktop file as SOURCE3 rather than screwing around with dos2unix From ec46d9d01c934b9a313cc21fac31b5cf6d7386e0 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 2 Jul 2007 15:15:20 +0000 Subject: [PATCH 3/6] Initialize branch EL-4 for wlassistant --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..6ec5cef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-4 From 74eba72124ad09487ca3816b7d2b8824b01f1f6e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 27 Aug 2007 17:55:25 +0000 Subject: [PATCH 4/6] rebuild for ppc32, license tag fix --- wlassistant.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wlassistant.spec b/wlassistant.spec index e8061ac..ec20640 100644 --- a/wlassistant.spec +++ b/wlassistant.spec @@ -1,7 +1,7 @@ Name: wlassistant Version: 0.5.5 Release: 1%{?dist} -License: GPL +License: GPLv2+ Group: Applications/System Summary: Wireless network management tool URL: http://wlassistant.sourceforge.net From b0fa8468f9b36892f5f826db6311e4be92888f07 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:17:35 +0000 Subject: [PATCH 5/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index afa25ee..420b722 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: wlassistant -# $Id$ +# $Id: Makefile,v 1.1 2005/09/17 20:52:08 spot Exp $ NAME := wlassistant 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 639d4f06b13da857bc21bad9a2bc88dfec2b5aa5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:22:23 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 420b722..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wlassistant -# $Id: Makefile,v 1.1 2005/09/17 20:52:08 spot Exp $ -NAME := wlassistant -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 6ec5cef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-4