SPECS: kdissert.spec - use system waf

glen glen at pld-linux.org
Tue Dec 5 18:22:25 CET 2006


Author: glen                         Date: Tue Dec  5 17:22:25 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use system waf

---- Files affected:
SPECS:
   kdissert.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/kdissert.spec
diff -u SPECS/kdissert.spec:1.12 SPECS/kdissert.spec:1.13
--- SPECS/kdissert.spec:1.12	Tue Dec  5 17:01:29 2006
+++ SPECS/kdissert.spec	Tue Dec  5 18:22:20 2006
@@ -3,15 +3,15 @@
 Summary(pl):	kdissert - narzędzie wspomagające tworzenie map myśli
 Name:		kdissert
 Version:	1.0.7
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications
 Source0:	http://freehackers.org/~tnagy/kdissert/%{name}-%{version}.tar.bz2
 # Source0-md5:	8e72785b8ab2adfc959522fcdcec10e6
 URL:		http://freehackers.org/~tnagy/kdissert/
 BuildRequires:	kdelibs-devel >= 9:3.2.0
-BuildRequires:	rpmbuild(macros) >= 1.129
-BuildRequires:	scons
+BuildRequires:	rpmbuild(macros) >= 1.335
+BuildRequires:	waf
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define         _noautoreq      libtool(.*)
@@ -37,28 +37,26 @@
 %{__sed} -i -e 's/Categories=.*/Categories=QT;KDE;Education;/g' src/appdata/kdissert.desktop
 
 %build
-export CXXFLAGS="%{rpmcflags}"
 export QTDIR="%{_usr}"
 
-# To install waf directories (.waf-version, .wafcache) in building directory.
-export WAF_HOME=`pwd`
-
 # autodetects all needed paths from kde-config not sure it supports amd64 at the moment
 # im talking about it with the maintainer of kde's scons-based buildsystem
 
-./waf configure \
-	--qtincludes=%{_includedir}/qt \
+%waf configure \
 	--prefix=%{_prefix} %{?debug:debug=full} \
+	--qtincludes=%{_includedir}/qt \
 %if "%{_lib}" == "lib64"
 	--libsuffix=64 \
 %endif
 	--qtlibs=%{_libdir}
-./waf
+
+%waf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT
-./waf install --destdir $RPM_BUILD_ROOT
+
+%waf install \
+	--destdir $RPM_BUILD_ROOT
 
 %find_lang %{name} --with-kde
 
@@ -105,6 +103,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/12/05 17:22:20  glen
+- use system waf
+
 Revision 1.12  2006/12/05 16:01:29  arekm
 - noautoreq libtool files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdissert.spec?r1=1.12&r2=1.13&f=u



More information about the pld-cvs-commit mailing list