[amarok/el6] UPDATE EPEL
Keiran Smith
affix at fedoraproject.org
Sun Mar 18 21:51:26 UTC 2012
commit 095f15ee828c401df52e69d24886b160b7dade48
Author: Keiran Smith <affix at affix.me>
Date: Sun Mar 18 21:51:00 2012 +0000
UPDATE EPEL
50bf5a7e55b08426fd60f4928e65ac066349f83d.patch | 26 ---
a62fed8c667a076daa21fdf8360708813f1bf9e0.patch | 76 -------
amarok.spec | 259 ++++++++++++++++++------
3 files changed, 195 insertions(+), 166 deletions(-)
---
diff --git a/amarok.spec b/amarok.spec
index e8815b0..7b545df 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,64 +1,60 @@
Name: amarok
Summary: Media player
-Version: 2.3.0
-Release: 5%{?dist}
+Version: 2.5.0
+Release: 1%{?dist}
-Group: Applications/Multimedia
-License: GPLv2+
+# KDE e.V. may determine that future GPL versions are accepted
+License: GPLv2 or GPLv3
Url: http://amarok.kde.org/
Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch50: amarok-2.2.1.90-qtscript_not_required.patch
+# Invoke a browser on the online UserBase documentation instead of KHelpCenter
+# for the help contents if the amarok-doc subpackage is not installed.
+Patch0: amarok-2.5.0-onlinedoc.patch
+
+#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
+# https://bugs.kde.org/show_bug.cgi?id=290123
+Patch100: amarok-2.5.0-kde48_context_view.patch
+# Load all tracks from XSPF using MetaProxy.
+# https://bugs.kde.org/show_bug.cgi?id=295199
+Patch101: 0001-Load-all-tracks-from-XSPF-using-MetaProxy.patch
BuildRequires: curl-devel
BuildRequires: desktop-file-utils
+## non-modular MusicBrainz-based audio fingerprint tag lookup support :(
+#BuildRequires: ffmpeg-devel libofa-devel
BuildRequires: gettext
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
-BuildRequires: loudmouth-devel
-BuildRequires: mysql-devel
-BuildRequires: mysql-embedded-devel
-BuildRequires: qca2-devel
-BuildRequires: soprano-devel
-BuildRequires: taglib-devel >= 1.6
-BuildRequires: taglib-extras-devel >= 1.0.1
-
+# extra libaio linkage comes from use of mysql_config --libs
+BuildRequires: mysql-embedded-devel libaio-devel
+BuildRequires: pkgconfig(libgpod-1.0) >= 0.7.0
+BuildRequires: pkgconfig(libmtp) >= 0.3.0
+BuildRequires: pkgconfig(libmygpo-qt) >= 1.0.5
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(loudmouth-1.0)
+BuildRequires: pkgconfig(qca2)
+BuildRequires: pkgconfig(soprano)
+BuildRequires: pkgconfig(taglib) >= 1.6
+BuildRequires: pkgconfig(taglib-extras) >= 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}
-
-# for trash protocol support, phonon kcm, etc...
-# FIXME: should probably be handled lower in the stack
Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
+%if 0%{?fedora} == 14
+# lame, see http://bugzilla.redhat.com/666173
+Requires: libmtp-hal
+%endif
-# 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
-
%description
Amarok is a multimedia player with:
- fresh playlist concept, very fast to use, with drag and drop
@@ -69,7 +65,6 @@ Amarok is a multimedia player with:
%package libs
Summary: Runtime libraries for %{name}
-Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
%description libs
@@ -77,20 +72,28 @@ Requires: %{name} = %{version}-%{release}
%package utils
Summary: Amarok standalone utilities
-Group: Applications/Multimedia
Obsoletes: amarok-collectionscanner < 2.0.90-2
Obsoletes: amarok-utilities < 2.0.96
%description utils
%{summary}, including amarokcollectionscanner.
+%package doc
+Summary: Application handbook, documentation.
+# for upgrade path
+Obsoletes: amarok < 2.5.0-4
+Requires: amarok = %{version}-%{release}
+BuildArch: noarch
+%description doc
+%{summary}.
+
%prep
%setup -q
-%patch50 -p1 -b .qtscript_not_required
-
-%patch100 -p1 -b .info_applet_workaround
-%patch101 -p1 -b .mp3_support_logic
+%patch0 -p1 -b .onlinedoc
+#patch50 -p1 -b .qtscript_not_required
+%patch100 -p1 -b .kde48_context_view
+%patch101 -p1 -b .loadall_xspf
%build
@@ -105,25 +108,21 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang amarok
+%find_lang amarok --with-kde --without-mo && mv amarok.lang amarok-doc.lang
+%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
+%find_lang amarokpkg && cat amarokpkg.lang >> amarok.lang
+%find_lang amarok_scriptengine_qscript && cat amarok_scriptengine_qscript.lang >> amarok.lang
# unpackaged files
-rm -f %{buildroot}%{_kde4_libdir}/libamarok{-sqlcollection,_taglib,lib,plasma,pud,ocsclient}.so
+rm -fv %{buildroot}%{_kde4_libdir}/libamarok{-sqlcollection,_taglib,core,lib,plasma,pud,ocsclient,-transcoding}.so
%check
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/amarok.desktop
-
-
-%clean
-rm -rf %{buildroot}
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/amarok_containers.desktop
%post
@@ -140,19 +139,14 @@ 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}/kconf_update/amarok*
%{_kde4_appsdir}/desktoptheme/Amarok-Mockup/
%{_kde4_appsdir}/desktoptheme/default/widgets/*
%{_kde4_appsdir}/solid/actions/amarok-play-audiocd.desktop
@@ -160,6 +154,7 @@ fi
%{_kde4_configdir}/amarok_homerc
%{_kde4_configdir}/amarokapplets.knsrc
%{_kde4_datadir}/applications/kde4/amarok.desktop
+%{_kde4_datadir}/applications/kde4/amarok_containers.desktop
%{_kde4_datadir}/config.kcfg/amarokconfig.kcfg
%{_kde4_datadir}/kde4/services/*.desktop
%{_kde4_datadir}/kde4/services/*.protocol
@@ -167,22 +162,158 @@ fi
%{_kde4_datadir}/kde4/servicetypes/*.desktop
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/strigi/*
%{_datadir}/dbus-1/interfaces/*.xml
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
%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*
%{_kde4_libdir}/libamarok-sqlcollection.so.1*
+%{_kde4_libdir}/libamarok-transcoding.so.1*
+%{_kde4_libdir}/libampache_account_login.so
%files utils -f amarokcollectionscanner_qt.lang
-%defattr(-,root,root,-)
%{_kde4_bindir}/amarokcollectionscanner
+%files doc -f amarok-doc.lang
+
%changelog
+* Tue Mar 18 2012 Keiran "Affix" Smith <fedora at affix.me> 2.5.0-1
+- Update of EPEL Packages
+
+* Tue Mar 13 2012 Rex Dieter <rdieter at fedoraproject.org> 2.5.0-8
+- Load all XSPF tracks (kde#295199)
+
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-7
+- Rebuilt for c++ ABI breakage
+
+* Sun Jan 29 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.5.0-6
+- help: invoke a browser on the online UserBase doc if amarok-doc not installed
+
+* Fri Jan 27 2012 Rex Dieter <rdieter at fedoraproject.org> 2.5.0-5
+- make -doc only handbook, put translations back in main pkg
+
+* Fri Jan 27 2012 Rex Dieter <rdieter at fedoraproject.org> 2.5.0-4
+- -doc subpkg for large'ish application handbook and translations
+
+* Fri Jan 27 2012 Rex Dieter <rdieter at fedoraproject.org> 2.5.0-3
+- fix context view when on kde48 (kde#290123)
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Fri Dec 16 2011 Rex Dieter <rdieter at fedoraproject.org> 2.5.0-1
+- 2.5.0
+
+* Mon Nov 14 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.90-1
+- 2.4.90
+
+* Wed Nov 09 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.3-4
+- pkgconfig-style deps
+- drop extraneous/old BR's
+
+* Mon Sep 19 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.3-3
+- Wikipedia applet crashes (kde#279813)
+
+* Fri Sep 16 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.3-2
+- re-enable libgpod support inadvertantly lost in 2.4.1.90-1
+
+* Sat Jul 30 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.3-1
+- 2.4.3
+
+* Sun Jul 24 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.2-2
+- don't query kwallet for lastfm credentials on every track change (kde#278177)
+
+* Fri Jul 22 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.2-1
+- 2.4.2
+
+* Fri Jul 08 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.1.90-1
+- 2.4.1.90
+- drop no-longer-needed %%ifarch s390 conditionals
+
+* Fri Jun 10 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.1-4
+- drop ancient Obsoletes
+
+* Fri Jun 10 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.1-3
+- rebuild (libmtp)
+
+* Tue May 24 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.1-2
+- BR: libmygpo-qt-devel
+
+* Fri May 06 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.1-1
+- 2.4.1 (final)
+
+* Wed Mar 23 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.0.90-2
+- rebuild (mysql)
+
+* Mon Mar 21 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.0.90-1
+- 2.4.1 beta1
+
+* Wed Feb 09 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.0-3
+- License: GPLv2 or GPLv3
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Jan 11 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.0-1
+- 2.4.0
+- libmtp-hal dependency missing for amarok (#666173)
+
+* Tue Dec 28 2010 Rex Dieter <rdieter at fedoraproject.org> 2.3.90-3
+- rebuild (mysql)
+
+* Tue Dec 07 2010 Thomas Janssen <thomasj at fedoraproject.org> 2.3.90-2
+- fixed missing libampache
+
+* Mon Dec 06 2010 Thomas Janssen <thomasj at fedoraproject.org> 2.3.90-1
+- 2.3.90 (2.4beta1)
+
+* Tue Nov 30 2010 Rex Dieter <rdieter at fedoraproject.org> 2.3.2-7
+- recognize audio/flac mimetype too (kde#257488)
+
+* Fri Nov 05 2010 Thomas Janssen <thomasj at fedoraproject.org> 2.3.2-6
+- rebuild for new libxml2
+
+* Thu Nov 04 2010 Rex Dieter <rdieter at fedoraproject.org> 2.3.2-5
+- appletsize patch
+- fix/improve ipod3 support patch
+- another collectionscanner patch
+
+* Wed Sep 29 2010 jkeating - 2.3.2-4
+- Rebuilt for gcc bug 634757
+
+* Fri Sep 24 2010 Thomas Janssen <thomasj at fedoraproject.org> 2.3.2-3
+- added patch to fix scanning qt bug/regression
+
+* Mon Sep 20 2010 Thomas Janssen <thomasj at fedoraproject.org> 2.3.2-2
+- added patch to fix BPM tags in flac
+
+* Thu Sep 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.2-1
+- amarok-2.3.2
+
+* Thu Sep 16 2010 Dan Horák <dan[at]danny.cz> - 2.3.1.90-3
+- no libgpod on s390(x)
+
+* Tue Aug 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.1.90-2
+- fix/patch installation of amarok handbooks
+
+* Mon Aug 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.1.90-1
+- amarok-2.3.1.90 (2.3.2 beta1)
+
+* Fri Jul 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.1-2
+- No Notification Area icon for non-KDE desktops (kde#232578,rh#603336)
+
+* 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
More information about the scm-commits
mailing list