rpms/kdissert/devel .cvsignore, 1.2, 1.3 kdissert.spec, 1.4, 1.5 sources, 1.2, 1.3

[Konstantin Ryabitsev (icon)]

Author: icon

Update of /cvs/extras/rpms/kdissert/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2963/devel

Modified Files:
	.cvsignore kdissert.spec sources 
Log Message:
Version 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdissert/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Oct 2005 05:12:39 -0000	1.2
+++ .cvsignore	22 Jul 2006 15:10:51 -0000	1.3
@@ -1 +1 @@
-kdissert-1.0.5.tar.bz2
+kdissert-1.0.6-waf.tar.bz2


Index: kdissert.spec
===================================================================
RCS file: /cvs/extras/rpms/kdissert/devel/kdissert.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdissert.spec	13 Feb 2006 19:14:38 -0000	1.4
+++ kdissert.spec	22 Jul 2006 15:10:51 -0000	1.5
@@ -1,15 +1,15 @@
 Name:           kdissert
-Version:        1.0.5
-Release:        1.1%{?dist}
+Version:        1.0.6
+Release:        1%{?dist}
 Summary:        Mind-mapping tool for KDE
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://freehackers.org/~tnagy/kdissert/
-Source0:        http://freehackers.org/~tnagy/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://freehackers.org/~tnagy/%{name}/%{name}-%{version}-waf.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs-devel, scons, desktop-file-utils
+BuildRequires:  kdelibs-devel, desktop-file-utils, gettext
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -22,20 +22,25 @@
 makers, engineers and businessmen.
 
 
-%prep
-%setup -q
-sed -i -e "/env.KDEuse(\"environ rpath\")/d" SConstruct
+%prep 
+%setup -q -n %{name}-%{version}-waf
+tar xjf miniwaf.tar.bz2
+./waf.py configure \
+    --prefix=%{_prefix} \
+    --execprefix=%{_exec_prefix} \
+    --datadir=%{_datadir} \
+    --libdir=%{_libdir}
 
 
 %build
 export CFLAGS=$RPM_OPT_FLAGS
 export CXXFLAGS=$RPM_OPT_FLAGS
-scons %{?_smp_mflags}
+./waf.py build %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-scons install DESTDIR=$RPM_BUILD_ROOT
+./waf.py install --destdir=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
 desktop-file-install \
@@ -85,6 +90,12 @@
 
 
 %changelog
+* Sat Jul 22 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.0.6-1
+- Version 1.0.6
+- No longer using scons
+- Rework to use the shipped-with waf
+- BR gettext
+
 * Mon Feb 13 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.0.5-1.1
 - FC5 Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdissert/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Oct 2005 05:12:39 -0000	1.2
+++ sources	22 Jul 2006 15:10:51 -0000	1.3
@@ -1 +1 @@
-18ff5d04d633cf3b4e3fbf869c18dd2f  kdissert-1.0.5.tar.bz2
+55bed147b66bd46de21e07475568469c  kdissert-1.0.6-waf.tar.bz2