rpms/ktorrent/F-10 ktorrent.spec,1.81,1.82

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6191/F-10

Modified Files:
	ktorrent.spec 
Log Message:
sync w/devel



Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-10/ktorrent.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- ktorrent.spec	17 Nov 2008 19:59:24 -0000	1.81
+++ ktorrent.spec	17 Nov 2008 20:06:12 -0000	1.82
@@ -11,7 +11,7 @@
 Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdelibs4-devel >= 4.1
+BuildRequires: kdelibs4-devel >= 4.1.0
 BuildRequires: avahi-devel
 BuildRequires: cmake   
 BuildRequires: desktop-file-utils
@@ -21,7 +21,9 @@
 BuildRequires: pcre-devel
 BuildRequires: gmp-devel
 
-Requires: kdelibs4 >= 4.1
+%global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.1.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+
+Requires: kdelibs4 >= %{kdelibs4_ver} 
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
@@ -64,11 +66,13 @@
 
 %post
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-/sbin/ldconfig 2>/dev/null
+xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig 2>/dev/null ||:
 
 %postun
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-/sbin/ldconfig 2>/dev/null
+xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig 2>/dev/null ||:
 
 %clean
 rm -rf $RPM_BUILD_ROOT