dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: wlassistant
-# $Id$
-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
-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)

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 @@
+ <bksys version="2">
+ <compile type="program" dirprefix="src" 
+          target="wlassistant"
+-         libs="kdeui qt-mt iw">
++         libs="kdecore kdeui qt-mt iw">
+ <source file="main.cpp"/>
+ <source file="netlistviewitem.cpp"/>
+ <source file="ui_NetParamsEdit.ui"/>

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 <tcallawa@redhat.com> - 0.5.7-12
+- fix implicit DSO linking issue with kdecore
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.7-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild