packages: amarok/amarok.spec - 2.3.0 - merged from DEVEL

[shadzik]

Author: shadzik                      Date: Tue Mar 30 09:19:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 2.3.0
- merged from DEVEL

---- Files affected:
packages/amarok:
   amarok.spec (1.217 -> 1.218) 

---- Diffs:

================================================================
Index: packages/amarok/amarok.spec
diff -u packages/amarok/amarok.spec:1.217 packages/amarok/amarok.spec:1.218
--- packages/amarok/amarok.spec:1.217	Sun Mar 14 18:38:25 2010
+++ packages/amarok/amarok.spec	Tue Mar 30 11:19:47 2010
@@ -9,15 +9,13 @@
 Summary:	A KDE audio player
 Summary(pl.UTF-8):	Odtwarzacz audio dla KDE
 Name:		amarok
-Version:	2.2.2
+Version:	2.3.0
 Release:	1
 License:	GPL
 Group:		X11/Applications/Multimedia
-Source0:	ftp://ftp.kde.org/pub/kde/%{state}/amarok/%{version}/src/%{name}-%{version}-patched.tar.bz2
-# Source0-md5:	9b4453597e4affb1a6bebe715499782f
-Patch0:		%{name}-link.patch
-Patch1:		%{name}-qthreadpool.patch
-Patch2:		%{name}-disable_qtscriptbindings_check_fix.patch
+Source0:	ftp://ftp.kde.org/pub/kde/%{state}/amarok/%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	fc672a2848e36b3b44eb81dd1466e4f4
+Patch0:		%{name}-disable_qtscriptbindings_check_fix.patch
 URL:		http://amarok.kde.org/
 BuildRequires:	Qt3Support-devel >= %{qtver}
 BuildRequires:	QtCore-devel >= %{qtver}
@@ -116,9 +114,7 @@
 
 %prep
 %setup -q
-#%patch0 -p0
-#%patch1 -p0
-%patch2 -p1
+%patch0 -p1
 
 %build
 install -d build
@@ -145,7 +141,10 @@
 # remove bogus dir
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/xx
 
-%find_lang %{name} --with-kde
+# remove unsupported locale
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/sr at ijekavian
+
+%find_lang %{name} --all-name --with-kde
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,6 +205,9 @@
 %attr(755,root,root) %{_libdir}/libamarokocsclient.so
 %attr(755,root,root) %ghost %{_libdir}/libamarokocsclient.so.?
 %attr(755,root,root) %{_libdir}/libamarokocsclient.so.*.*.*
+%attr(755,root,root) %{_libdir}/libamarok-sqlcollection.so
+%attr(755,root,root) %ghost %{_libdir}/libamarok-sqlcollection.so.?
+%attr(755,root,root) %{_libdir}/libamarok-sqlcollection.so.*.*.*
 %attr(755,root,root) %{_libdir}/libamarokpud.so
 %dir %{_datadir}/apps/amarok/scripts
 %{_datadir}/apps/amarok/data
@@ -224,6 +226,7 @@
 %{_datadir}/dbus-1/interfaces/org.kde.amarok.SqlCollection.xml
 %{_datadir}/kde4/services/amarok.protocol
 %{_datadir}/kde4/services/amaroklastfm.protocol
+%{_datadir}/kde4/services/amarokitpc.protocol
 %{_datadir}/kde4/services/ServiceMenus/amarok_append.desktop
 %{_datadir}/kde4/services/amarok-containment-vertical.desktop
 %{_datadir}/kde4/services/amarok-context-applet-currenttrack.desktop
@@ -294,6 +297,24 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.218  2010/03/30 09:19:47  shadzik
+- 2.3.0
+- merged from DEVEL
+
+Revision 1.217.2.4  2010/03/30 09:18:17  shadzik
+- revised patches
+- rel 1
+
+Revision 1.217.2.3  2010/03/16 19:28:39  lmasko
+- Locale problem solved. Seems to be OK.
+
+Revision 1.217.2.2  2010/03/16 18:44:15  lmasko
+- Up to 2.3.0.
+- Needs correction of packaging files, too many locale files left.
+
+Revision 1.217.2.1  2010/03/14 19:35:13  arvenil
+- up to 2.2.2.90
+
 Revision 1.217  2010/03/14 17:38:25  arvenil
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amarok/amarok.spec?r1=1.217&r2=1.218&f=u