rpms/kdelibs/devel kdelibs.spec,1.644,1.645

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11564

Modified Files:
	kdelibs.spec 
Log Message:
revert to using %_qt4_version macro again
drop icon-name-qt47 patch



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.644
retrieving revision 1.645
diff -u -p -r1.644 -r1.645
--- kdelibs.spec	21 Jul 2010 13:02:42 -0000	1.644
+++ kdelibs.spec	21 Jul 2010 13:57:25 -0000	1.645
@@ -1,10 +1,9 @@
 
 %define attica_ver 0.1.4
 %define phonon_ver 4.4.0
+%define qt4_ver 4.7.0-0.25.beta2
 %define soprano_ver 2.4.63
 %define strigi_ver 0.7.1
-%define qt4_ver 4.7.0
-
 # to build/include apidocs or not
 %define apidocs 1
 
@@ -47,8 +46,6 @@ Requires: shared-mime-info
 Requires: soprano%{?_isa} >= %{soprano_version} 
 %global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
 Requires: strigi-libs%{?_isa} >= %{strigi_version} 
-%global qt4_version %(pkg-config --modversion Qt 2>/dev/null || echo %{qt4_ver})
-Requires: qt4%{?_isa} >= %{qt4_version}
 
 # make -devel packages parallel-installable
 Patch0: kdelibs-4.4.85-parallel_devel.patch
@@ -97,8 +94,9 @@ Patch200: kdelibs-4.3.1-CVE-2009-2702.pa
 Conflicts: kdebase-workspace-libs < 4.3.80
 %endif
 
-BuildRequires: qt4-devel >= %{qt4_version}
+BuildRequires: qt4-devel >= %{qt4_ver}
 BuildRequires: qt4-webkit-devel
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 Requires: xdg-utils
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -232,7 +230,7 @@ format for easy browsing.
 %patch24 -p1 -b .drkonq
 %endif
 %patch27 -p1 -b .no_rpath
-%patch28 -p1 -b .icon-name-qt47
+#patch28 -p1 -b .icon-name-qt47
 
 # upstreamable patches
 
@@ -451,8 +449,9 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Jul 21 2010 Than Ngo <than at redhat.com> - 4.4.92-4
-- requires: qt >= 4.7.0
+* Wed Jul 21 2010 Than Ngo <than at redhat.com> - 6:4.4.92-4
+- (Build)Requires: qt4(-devel) >= 4.7.0
+- drop icon-name-qt47 patch
 
 * Fri Jul 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.92-3
 - Requires: oxygen-icon-theme (ensures default fallback is present)