From 56e3eb7566c1827d4c42a9e9ba74e0c49c1e1f78 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:17:36 +0000 Subject: [PATCH 1/4] 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 5438f21c4eec03e6f0cce251fa5d41ed9e652287 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:28:35 +0000 Subject: [PATCH 2/4] Initialize branch EL-6 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..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 956dc8139b956f2c3d0e20a6dc84413e88a57dd9 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 8 Jul 2010 18:58:42 +0000 Subject: [PATCH 3/4] sync --- wlassistant-0.5.7-fix-implicit-DSO-kdecore.patch | 12 ++++++++++++ wlassistant.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 wlassistant-0.5.7-fix-implicit-DSO-kdecore.patch diff --git a/wlassistant-0.5.7-fix-implicit-DSO-kdecore.patch b/wlassistant-0.5.7-fix-implicit-DSO-kdecore.patch new file mode 100644 index 0000000..53140ef --- /dev/null +++ b/wlassistant-0.5.7-fix-implicit-DSO-kdecore.patch @@ -0,0 +1,12 @@ +diff -up wlassistant-0.5.7/config.bks.BAD wlassistant-0.5.7/config.bks +--- wlassistant-0.5.7/config.bks.BAD 2010-02-19 15:10:56.627502048 -0500 ++++ wlassistant-0.5.7/config.bks 2010-02-19 15:11:00.954485007 -0500 +@@ -2,7 +2,7 @@ + + ++ libs="kdecore kdeui qt-mt iw"> + + + diff --git a/wlassistant.spec b/wlassistant.spec index 67adc5b..2a1d1d1 100644 --- a/wlassistant.spec +++ b/wlassistant.spec @@ -1,6 +1,6 @@ Name: wlassistant Version: 0.5.7 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ Group: Applications/System Summary: Wireless network management tool @@ -19,6 +19,7 @@ Patch0: wlassistant-0.5.5-rpath.patch Patch1: wlassistant-0.5.7-fd_cloexec.patch Patch2: wlassistant-0.5.7-fix_scons_chmod_error.patch Patch3: wlassistant-0.5.7-inline.patch +Patch4: wlassistant-0.5.7-fix-implicit-DSO-kdecore.patch %description Wireless Assistant (wlassistant) is a small application that allows you to @@ -38,6 +39,7 @@ MAIN FEATURES: %patch1 -p1 %patch2 -p1 %patch3 -p1 -b .gcc44 +%patch4 -p1 -b .DSO %build PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` @@ -91,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* Fri Feb 19 2010 Tom "spot" Callaway - 0.5.7-12 +- fix implicit DSO linking issue with kdecore + * Mon Jul 27 2009 Fedora Release Engineering - 0.5.7-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 307e85ae13f0068a62e523fcdbb01ff0acd53863 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:22:30 +0000 Subject: [PATCH 4/4] 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 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6