rpms/amarok/F-11 .cvsignore, 1.45, 1.46 amarok.spec, 1.151, 1.152 sources, 1.47, 1.48 amarok-2.1.1-lyricwiki.patch, 1.1, NONE

Wed Sep 30 18:37:12 UTC 2009

Author: rdieter

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

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	amarok-2.1.1-lyricwiki.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/F-11/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46

--- .cvsignore	13 Jun 2009 23:25:03 -0000	1.45
+++ .cvsignore	30 Sep 2009 18:37:12 -0000	1.46
@@ -1 +1 @@
-amarok-2.1.1.tar.bz2
+amarok-2.2.0.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/amarok.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- amarok.spec	2 Sep 2009 17:19:09 -0000	1.151
+++ amarok.spec	30 Sep 2009 18:37:12 -0000	1.152
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.1.1
-Release: 5%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -12,15 +12,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
-## upstream patches
-# https://bugs.kde.org/show_bug.cgi?id=202366
-Patch100: amarok-2.1.1-lyricwiki.patch
-
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel 
 BuildRequires: libifp-devel
+BuildRequires: liblastfm-devel
 BuildRequires: libmp4v2-devel
 %if 0%{?fedora} > 9
 BuildRequires: libmtp-devel >= 0.3.0
@@ -32,16 +29,18 @@ BuildRequires: libxml2-devel
 BuildRequires: loudmouth-devel
 BuildRequires: mysql-embedded-devel
 BuildRequires: soprano-devel
-BuildRequires: taglib-devel
-BuildRequires: taglib-extras-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 >= %{_qt4_version}}
-%{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_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}
 
+# when we grew a -libs subpkg, multilib love
+Obsoletes: amarok < 2.1.80
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
 Obsoletes: amarok-devel < 1.4.9 
 Obsoletes: amarok-konqueror < 1.5
 Obsoletes: amarok-visualisation < 1.5
@@ -54,6 +53,15 @@ Amarok is a multimedia player with:
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
+%package libs
+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}.
+
 %package utils
 Summary: Amarok standalone utilities
 Group: Applications/Multimedia
@@ -64,10 +72,9 @@ Obsoletes: amarok-utilities < 2.0.96
 
 
 %prep
-%setup -q
+%setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
-%patch100 -p1 -b .lyricwiki
 
 
 %build
@@ -84,12 +91,15 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang amarok
-%find_lang amarokcollectionscanner_qt
+%find_lang amarok 
+%find_lang amarokcollectionscanner_qt 
+%find_lang amarokpkg 
+%find_lang amarok_scriptengine_qscript 
+cat amarokpkg.lang >> amarok.lang
+cat amarok_scriptengine_qscript.lang >> amarok.lang
 
 # unpackaged files
-rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud}.so
-rm -f %{buildroot}%{_kde4_libdir}/libmediadevicelib.so
+rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud,ocsclient}.so
 
 
 %check
@@ -101,7 +111,6 @@ rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %posttrans
@@ -109,26 +118,31 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 update-desktop-database -q &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files -f amarok.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_kde4_bindir}/amarok
+%{_kde4_bindir}/amarokpkg
 %{_kde4_bindir}/amarok_afttagger
 %{_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
 %{_kde4_configdir}/amarok_homerc
+%{_kde4_configdir}/amarokapplets.knsrc
 %{_kde4_datadir}/applications/kde4/amarok.desktop
 %{_kde4_datadir}/config.kcfg/amarokconfig.kcfg
 %{_kde4_datadir}/kde4/services/*.desktop
@@ -137,20 +151,45 @@ fi
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/libamarok*.so.*
-%{_kde4_libdir}/libmediadevicelib.so.*
-%{_kde4_libdir}/libamarok_service_liblastfm.so
 %{_kde4_libdir}/strigi/*
 %{_datadir}/dbus-1/interfaces/*.xml
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libamaroklib.so.1*
+%{_kde4_libdir}/libamarokocsclient.so.4*
+%{_kde4_libdir}/libamarokpud.so.1*
+
 %files utils -f amarokcollectionscanner_qt.lang
 %defattr(-,root,root,-)
 %{_kde4_bindir}/amarokcollectionscanner
 
 
 %changelog
-* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-5
-- lyricwiki patch respin (kdebug#202366)
+* 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
+
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-1
+- amarok-2.1.90 (2.2rc1)
+
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.85-2
+- BR: taglib-devel >= 1.6, taglib-extras-devel >= 1.0
+
+* 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
+
+* Wed Sep 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.80-1
+- amarok-2.1.80 (2.2beta1)
+- -libs subpkg
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.1-5
+- rebuilt with new openssl
 
 * Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-4
 - lyricwiki patch (kdebug#202366)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	13 Jun 2009 23:25:03 -0000	1.47
+++ sources	30 Sep 2009 18:37:12 -0000	1.48
@@ -1 +1 @@
-c4ebec02fd1e8b3ef0d7a041726e6780  amarok-2.1.1.tar.bz2
+5a0188c5eb7d343109b82964942d8eb5  amarok-2.2.0.tar.bz2


--- amarok-2.1.1-lyricwiki.patch DELETED ---


