rpms/amarok/F-11 .cvsignore, 1.50, 1.51 amarok.spec, 1.165, 1.166 sources, 1.52, 1.53 50bf5a7e55b08426fd60f4928e65ac066349f83d.patch, 1.1, NONE a62fed8c667a076daa21fdf8360708813f1bf9e0.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22037

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	50bf5a7e55b08426fd60f4928e65ac066349f83d.patch 
	a62fed8c667a076daa21fdf8360708813f1bf9e0.patch 
Log Message:
* Fri May 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.1-1
- amarok-2.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	11 Mar 2010 11:20:43 -0000	1.50
+++ .cvsignore	28 May 2010 23:05:25 -0000	1.51
@@ -1 +1 @@
-amarok-2.3.0.tar.bz2
+amarok-2.3.1.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/amarok.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- amarok.spec	25 Mar 2010 19:04:05 -0000	1.165
+++ amarok.spec	28 May 2010 23:05:26 -0000	1.166
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.3.0
-Release: 5%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -13,13 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch50: amarok-2.2.1.90-qtscript_not_required.patch
 
 ## upstream patches
-# http://bugs.kde.org/227639
-# http://bugs.kde.org/229756
-Patch100: http://gitorious.org/amarok/amarok/commit/a62fed8c667a076daa21fdf8360708813f1bf9e0.patch
-# fix mp3-support detection logic
-Patch101: http://gitorious.org/amarok/amarok/commit/50bf5a7e55b08426fd60f4928e65ac066349f83d.patch
-# may need to rebase this, for building with qt-4.7
-# http://gitorious.org/amarok/amarok/commit/aa5ca5d179d084e99c8a477084ba717c35aa5030
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -28,10 +21,8 @@ BuildRequires: kdelibs4-devel 
 BuildRequires: libifp-devel
 BuildRequires: liblastfm-devel
 BuildRequires: libmp4v2-devel
-%if 0%{?fedora} > 9
 BuildRequires: libmtp-devel >= 0.3.0
 BuildRequires: libgpod-devel >= 0.7.0
-%endif
 BuildRequires: libnjb-devel
 BuildRequires: libusb-devel
 BuildRequires: libxml2-devel
@@ -43,6 +34,8 @@ BuildRequires: soprano-devel
 BuildRequires: taglib-devel >= 1.6
 BuildRequires: taglib-extras-devel >= 1.0.1
 
+# not strictly required at buildtime, but if it's not available here,
+# then you're hosed at runtime anyway
 BuildRequires: qtscriptbindings
 Requires: qtscriptbindings%{?_isa}
 Requires: %{name}-utils = %{version}-%{release}
@@ -89,9 +82,6 @@ Obsoletes: amarok-utilities < 2.0.96
 
 %patch50 -p1 -b .qtscript_not_required
 
-%patch100 -p1 -b .info_applet_workaround 
-%patch101 -p1 -b .mp3_support_logic
-
 
 %build
 mkdir -p %{_target_platform}
@@ -115,7 +105,7 @@ cat amarokpkg.lang >> amarok.lang
 cat amarok_scriptengine_qscript.lang >> amarok.lang
 
 # unpackaged files
-rm -f %{buildroot}%{_kde4_libdir}/libamarok{-sqlcollection,_taglib,lib,plasma,pud,ocsclient}.so
+rm -f %{buildroot}%{_kde4_libdir}/libamarok{-sqlcollection,_taglib,core,lib,plasma,pud,ocsclient}.so
 
 
 %check
@@ -172,6 +162,7 @@ fi
 
 %files libs
 %defattr(-,root,root,-)
+%{_kde4_libdir}/libamarokcore.so.1*
 %{_kde4_libdir}/libamaroklib.so.1*
 %{_kde4_libdir}/libamarokocsclient.so.4*
 %{_kde4_libdir}/libamarokpud.so.1*
@@ -183,6 +174,12 @@ fi
 
 
 %changelog
+* Fri May 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.1-1
+- amarok-2.3.1
+
+* Sat Apr 17 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.0.90-1
+- amarok-2.3.0.90
+
 * Thu Mar 25 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.0-5
 - fix mp3 support logic
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	11 Mar 2010 11:20:44 -0000	1.52
+++ sources	28 May 2010 23:05:26 -0000	1.53
@@ -1 +1 @@
-fc672a2848e36b3b44eb81dd1466e4f4  amarok-2.3.0.tar.bz2
+6679adaf5cc757b1515a9f03cdcb6066  amarok-2.3.1.tar.bz2


--- 50bf5a7e55b08426fd60f4928e65ac066349f83d.patch DELETED ---


--- a62fed8c667a076daa21fdf8360708813f1bf9e0.patch DELETED ---