rpms/amarok/devel amarok.spec,1.139,1.140

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3879

Modified Files:
	amarok.spec 
Log Message:
* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-2
- add minimal qt4,kdelibs4 deps



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- amarok.spec	5 Mar 2009 15:59:56 -0000	1.139
+++ amarok.spec	6 Mar 2009 16:13:53 -0000	1.140
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -35,6 +35,11 @@
 BuildRequires: soprano-devel
 BuildRequires: taglib-devel
 
+# 
+%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
+%{?_kdelibs4_version:Requires: kdelibs4 >= %{_kdelibs4_version}}
+
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
@@ -55,17 +60,24 @@
 
 %if 0%{?fedora} > 10
 %patch0 -p0 -b .libgpod-0.7.0
+%patch100 -p0 -b .qt45
 %endif
 %patch1 -p1 -b .gcc4
 
-%patch100 -p0 -b .qt45
-
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
+
+%if 0
+# hack around qt45 patch-induced(?) smp borkage
+pushd src/scriptengine/generator/generator
+./generate.sh
+popd
+%endif
+
 make %{?_smp_mflags} -C %{_target_platform}
 
 
@@ -117,13 +129,16 @@
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/kde4/plugins/script/*.so
-%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/libamarok*.so.*
 %{_kde4_libdir}/libamarok_service_liblastfm.so
 %{_kde4_libdir}/strigi/*
 %{_datadir}/dbus-1/interfaces/*.xml
 
 
 %changelog
+* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-2
+- add minimal qt4,kdelibs4 deps
+
 * Wed Mar 04 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-1
 - amarok-2.0.2