rpms/kdissert/devel kdissert.spec,1.11,1.12

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdissert.spec 
Log Message:
* Tue Apr 01 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.7-4
- fix rawhide build (#434133)
- d-f-i: fix double vendor
- Summary: s/for KDE// 
- License: GPLv2
- scriptlet deps



Index: kdissert.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdissert/devel/kdissert.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kdissert.spec	29 Mar 2008 03:11:21 -0000	1.11
+++ kdissert.spec	1 Apr 2008 13:48:56 -0000	1.12
@@ -1,17 +1,15 @@
 Name:           kdissert
 Version:        1.0.7
-Release:        3%{?dist}
-Summary:        Mind-mapping tool for KDE 3
+Release:        4%{?dist}
+Summary:        Mind-mapping tool
 
 Group:          Applications/Productivity
-License:        GPL
+License:        GPLv2
 URL:            http://freehackers.org/~tnagy/kdissert/
 Source0:        http://freehackers.org/~tnagy/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs3-devel, desktop-file-utils, gettext
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
 
 %description
 Kdissert is a mindmapping-like tool to help students to produce complicated 
@@ -24,35 +22,42 @@
 
 %prep 
 %setup -q
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
 
 
 %build
+
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+
 ./waf configure \
     --prefix=%{_prefix} \
     --execprefix=%{_exec_prefix} \
     --datadir=%{_datadir} \
     --libdir=%{_libdir} \
     --want-rpath=0
+
 ./waf build %{?_smp_mflags}
 
 
 %install
 rm -rf $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 \
     --delete-original \
-    --vendor fedora \
+    --vendor="" \
     --dir %{buildroot}%{_datadir}/applications/kde \
     --remove-category X-KDE-More \
     --remove-category Utility \
     --add-category Office \
-    --add-category X-Fedora \
     --remove-key DocPath \
     $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
+
 %find_lang %{name}
 
 
@@ -63,7 +68,6 @@
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-
 %postun
 update-desktop-database &> /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -90,6 +94,13 @@
 
 
 %changelog
+* Tue Apr 01 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.7-4
+- fix rawhide build (#434133)
+- d-f-i: fix double vendor
+- Summary: s/for KDE// 
+- License: GPLv2
+- scriptlet deps
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.7-3
 - Autorebuild for GCC 4.3