rpms/amarok/F-12 .cvsignore, 1.49, 1.50 amarok.spec, 1.161, 1.162 sources, 1.50, 1.51 amarok-2.1.80-lyricwiki.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13909

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	amarok-2.1.80-lyricwiki.patch 
Log Message:
sync w/devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	2 Sep 2009 17:21:05 -0000	1.49
+++ .cvsignore	14 Sep 2009 20:51:02 -0000	1.50
@@ -1 +1 @@
-amarok-2.1.80.tar.bz2
+amarok-2.1.85.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/amarok.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- amarok.spec	2 Sep 2009 17:21:05 -0000	1.161
+++ amarok.spec	14 Sep 2009 20:51:03 -0000	1.162
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.1.80
-Release: 2%{?dist}
+Version: 2.1.85
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -13,7 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
 ## upstream patches
-Patch100: amarok-2.1.80-lyricwiki.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -79,8 +78,6 @@ Obsoletes: amarok-utilities < 2.0.96
 
 %patch50 -p1 -b .qtscript_not_required
 
-%patch100 -p1 -b .lyricwiki
-
 
 %build
 mkdir -p %{_target_platform}
@@ -143,7 +140,6 @@ fi
 %{_kde4_bindir}/amarokmp3tunesharmonydaemon
 %{_kde4_appsdir}/amarok/
 %{_kde4_appsdir}/desktoptheme/Amarok-Mockup/
-%{_kde4_appsdir}/desktoptheme/amarok-default.desktop
 %{_kde4_appsdir}/desktoptheme/default/widgets/*
 %{_kde4_appsdir}/solid/actions/amarok-play-audiocd.desktop
 %{_kde4_configdir}/amarok.knsrc
@@ -172,6 +168,9 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-1
+- amarok-2.1.85 (2.2beta2)
+
 * Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.80-2
 - another lyricwiki fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	2 Sep 2009 17:21:05 -0000	1.50
+++ sources	14 Sep 2009 20:51:03 -0000	1.51
@@ -1 +1 @@
-0d9ba377d697691bab5d97fed818f8f1  amarok-2.1.80.tar.bz2
+38311a55767fb8d85254b248a46433d8  amarok-2.1.85.tar.bz2


--- amarok-2.1.80-lyricwiki.patch DELETED ---