rpms/amarok/devel amarok.spec,1.181,1.182

Rex Dieter rdieter at fedoraproject.org
Thu Jan 28 14:53:02 UTC 2010


Author: rdieter

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

Modified Files:
	amarok.spec 
Log Message:
* Thu Jan 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.2.2-4
- use %{_kde4_version} provided elsewhere (kde-filesystem)



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- amarok.spec	10 Jan 2010 14:07:33 -0000	1.181
+++ amarok.spec	28 Jan 2010 14:53:02 -0000	1.182
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -39,14 +39,13 @@ BuildRequires: soprano-devel
 BuildRequires: taglib-devel >= 1.6
 BuildRequires: taglib-extras-devel >= 1.0.1
 
-%global kde4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 BuildRequires: qtscriptbindings
 Requires: qtscriptbindings%{?_isa}
 Requires: %{name}-utils = %{version}-%{release}
 
 # for trash protocol support, phonon kcm, etc...
 # FIXME: should probably be handled lower in the stack
-Requires: kdebase-runtime >= %{kde4_version}
+Requires: kdebase-runtime %{?_kde4_version:>= %{_kde4_version}}
 
 # when we grew a -libs subpkg, multilib love
 Obsoletes: amarok < 2.1.80
@@ -181,6 +180,9 @@ fi
 
 
 %changelog
+* Thu Jan 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.2.2-4
+- use %%{_kde4_version} provided elsewhere (kde-filesystem)
+
 * Sun Jan 10 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.2.2-3
 - collection scan crash patch, take 2 (kde#220532)
 



More information about the scm-commits mailing list