- 2.3.0

- merged from DEVEL

Changed files:
    amarok.spec -> 1.218

diff --git a/amarok.spec b/amarok.spec
index f49dd338af215b66e50fb99f44a1a87e582a9190..4819b6d1dab813c419b321ee6be73414a01dd768 100644 (file)
--- a/amarok.spec
+++ b/amarok.spec
@@ -8,15 +8,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}
@@ -115,9 +113,7 @@ Więcej o skryptach w amaroKu można dowiedzieć się stąd:
 
 %prep
 %setup -q
-#%patch0 -p0
-#%patch1 -p0
-%patch2 -p1
+%patch0 -p1
 
 %build
 install -d build
@@ -144,7 +140,10 @@ rm -rf $RPM_BUILD_ROOT
 # 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@ijekavian
+
+%find_lang %{name} --all-name --with-kde
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -205,6 +204,9 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -223,6 +225,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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