rpms/amarok/devel .cvsignore, 1.51, 1.52 amarok.spec, 1.165, 1.166 sources, 1.52, 1.53 post-2.1.90-20090923git.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	post-2.1.90-20090923git.patch 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
- amarok-2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	22 Sep 2009 02:01:06 -0000	1.51
+++ .cvsignore	29 Sep 2009 11:50:02 -0000	1.52
@@ -1 +1 @@
-amarok-2.1.90.tar.bz2
+amarok-2.2.0.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- amarok.spec	24 Sep 2009 01:34:17 -0000	1.165
+++ amarok.spec	29 Sep 2009 11:50:02 -0000	1.166
@@ -1,23 +1,17 @@
 
-%define snap 20090923git
-
 Name:    amarok
 Summary: Media player
-Version: 2.1.90
-Release: 2.%{snap}%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 Url:     http://amarok.kde.org/
-Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
-#Source0:  amarok-%{version}-%{snap}.tar.bz2
+Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
-# mostly a:  git diff v2.1.90
-Patch100: post-2.1.90-%{snap}.patch 
-
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -38,8 +32,7 @@ BuildRequires: soprano-devel
 BuildRequires: taglib-devel >= 1.6
 BuildRequires: taglib-extras-devel >= 1.0.0
 
-%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%{?_isa} >= %{_qt4_version}}
+%global kdelibs4_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}
@@ -65,6 +58,7 @@ Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 %{?kdelibs4_version:Requires: kdelibs4%{?_isa} >= %{kdelibs4_version}}
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 %description libs
 %{summary}.
 
@@ -81,7 +75,6 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
-%patch100 -p1 -b .20090923git
 
 
 %build
@@ -173,6 +166,9 @@ fi
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
+- amarok-2.2.0
+
 * Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-2.20090923git
 - 20090923git snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	22 Sep 2009 02:01:06 -0000	1.52
+++ sources	29 Sep 2009 11:50:02 -0000	1.53
@@ -1 +1 @@
-ec727ed72c5d371fb659ce0c3c1e6136  amarok-2.1.90.tar.bz2
+5a0188c5eb7d343109b82964942d8eb5  amarok-2.2.0.tar.bz2


--- post-2.1.90-20090923git.patch DELETED ---