SPECS: wlassistant.spec - builds ! - use scons

[shadzik]

Author: shadzik                      Date: Wed Feb 28 14:46:19 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- builds !
- use scons

---- Files affected:
SPECS:
   wlassistant.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/wlassistant.spec
diff -u SPECS/wlassistant.spec:1.22 SPECS/wlassistant.spec:1.23
--- SPECS/wlassistant.spec:1.22	Wed Feb 28 15:03:08 2007
+++ SPECS/wlassistant.spec	Wed Feb 28 15:46:14 2007
@@ -8,10 +8,12 @@
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/wlassistant/%{name}-%{version}.tar.bz2
 # Source0-md5:	06b767d637e9a2374b07e9e079e2d40d
+Patch0:		%{name}-fixkdeconfig.patch
 URL:		http://wlassistant.sourceforge.net/
 BuildRequires:	kdelibs-devel
 BuildRequires:	libiw-devel
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.337
 BuildRequires:	scons
 BuildRequires:	zlib-devel
 Requires:	dhcpcd
@@ -29,25 +31,28 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
-export PYTHON=/usr/bin/python
-export SCONS=/usr/bin/scons
-./configure \
+%{__scons} configure \
 %if "%{_lib}" == "lib64"
 	libsuffix=64 \
 %endif
 	prefix=%{_prefix} \
 	datadir=%{_datadir} \
-	qtdir=%{_libdir}/qt \
+	qtdir=%{_prefix} \
+	kdedir=%{_prefix} \
+	kdelibs=%{_libdir} \
+	qtlibs=%{_libdir}/qt \
+	kdeincludes=%{_includedir} \
+	execprefix=%{_bindir} \
 	qtincludes=%{_includedir}/qt
-
-%{__make}
+%{__scons} .
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__scons} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_desktopdir}
@@ -71,6 +76,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2007/02/28 14:46:14  shadzik
+- builds !
+- use scons
+
 Revision 1.22  2007/02/28 14:03:08  shadzik
 - readd qtdir, export some variables
 - still doesn't build - stupid python checks
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/wlassistant.spec?r1=1.22&r2=1.23&f=u