rpms/kdissert/FC-4 .cvsignore, 1.3, 1.4 kdissert.spec, 1.4, 1.5 sources, 1.3, 1.4

[Konstantin Ryabitsev (icon)]

Author: icon

Update of /cvs/extras/rpms/kdissert/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6181/FC-4

Modified Files:
	.cvsignore kdissert.spec sources 
Log Message:
Upstream 1.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdissert/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Jul 2006 15:10:50 -0000	1.3
+++ .cvsignore	17 Dec 2006 20:21:58 -0000	1.4
@@ -1 +1 @@
-kdissert-1.0.6-waf.tar.bz2
+kdissert-1.0.7.tar.bz2


Index: kdissert.spec
===================================================================
RCS file: /cvs/extras/rpms/kdissert/FC-4/kdissert.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdissert.spec	22 Jul 2006 15:10:50 -0000	1.4
+++ kdissert.spec	17 Dec 2006 20:21:58 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           kdissert
-Version:        1.0.6
+Version:        1.0.7
 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}-waf.tar.bz2
+Source0:        http://freehackers.org/~tnagy/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel, desktop-file-utils, gettext
@@ -23,24 +23,24 @@
 
 
 %prep 
-%setup -q -n %{name}-%{version}-waf
-tar xjf miniwaf.tar.bz2
-./waf.py configure \
+%setup -q
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+./waf configure \
     --prefix=%{_prefix} \
     --execprefix=%{_exec_prefix} \
     --datadir=%{_datadir} \
-    --libdir=%{_libdir}
+    --libdir=%{_libdir} \
+    --want-rpath=0
 
 
 %build
-export CFLAGS=$RPM_OPT_FLAGS
-export CXXFLAGS=$RPM_OPT_FLAGS
-./waf.py build %{?_smp_mflags}
+./waf build %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-./waf.py install --destdir=$RPM_BUILD_ROOT
+./waf install --destdir=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
 desktop-file-install \
@@ -78,7 +78,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ROADMAP doc
+%doc AUTHORS COPYING README ROADMAP
 %{_bindir}/*
 %{_libdir}/kde*/*
 %{_datadir}/apps/*
@@ -90,6 +90,15 @@
 
 
 %changelog
+* Sun Dec 17 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.0.7-1
+- Upstream 1.0.7
+- Fixes for updated waf script
+
+* Sun Sep 03 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.0.6b-1
+- Version 1.0.6b
+- Move flags to configure stage
+- We don't want rpath, thanks
+
 * Sat Jul 22 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.0.6-1
 - Version 1.0.6
 - No longer using scons


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdissert/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jul 2006 15:10:50 -0000	1.3
+++ sources	17 Dec 2006 20:21:58 -0000	1.4
@@ -1 +1 @@
-55bed147b66bd46de21e07475568469c  kdissert-1.0.6-waf.tar.bz2
+88ad0d4f67bded1aac307434564215fc  kdissert-1.0.7.tar.bz2