rpms/amarok/F-10 amarok-2.0.90-qtscript_not_required.patch, NONE, 1.1 amarok.spec, 1.137, 1.138 sources, 1.44, 1.45 amarok-2.0.1.1-gcc44.patch, 1.1, NONE amarok-2.0.1.1-qt45.patch, 1.1, NONE amarok-2.0.2-fix_lastfm_auth.patch, 1.1, NONE amarok-2.0.2-no_qtscriptgenerator.patch, 1.1, NONE amarok-libgpod-0.7.0.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Mon May 18 16:37:45 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/amarok/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4539
Modified Files:
amarok.spec sources
Added Files:
amarok-2.0.90-qtscript_not_required.patch
Removed Files:
amarok-2.0.1.1-gcc44.patch amarok-2.0.1.1-qt45.patch
amarok-2.0.2-fix_lastfm_auth.patch
amarok-2.0.2-no_qtscriptgenerator.patch
amarok-libgpod-0.7.0.patch
Log Message:
sync w/devel for 2.1 goodness
amarok-2.0.90-qtscript_not_required.patch:
--- NEW FILE amarok-2.0.90-qtscript_not_required.patch ---
diff -up amarok-2.0.90/CMakeLists.txt.qtscript_not_required amarok-2.0.90/CMakeLists.txt
--- amarok-2.0.90/CMakeLists.txt.qtscript_not_required 2009-04-06 16:29:12.000000000 -0500
+++ amarok-2.0.90/CMakeLists.txt 2009-04-10 13:00:07.000000000 -0500
@@ -38,8 +38,8 @@ if( WITH_PLAYER )
macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.2.0" "" )
- find_package( QtScriptQtBindings REQUIRED )
- macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" TRUE "" "" )
+ macro_optional_find_package(QtScriptQtBindings)
+ macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" FALSE "" "" )
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- amarok.spec 9 Apr 2009 14:13:22 -0000 1.137
+++ amarok.spec 18 May 2009 16:37:14 -0000 1.138
@@ -1,38 +1,39 @@
+%define snap 20090518
+
Name: amarok
Summary: Media player
-Version: 2.0.2
-Release: 6%{?dist}
+Version: 2.0.96
+Release: 2.%{snap}%{?dist}
Group: Applications/Multimedia
License: GPLv2+
Url: http://amarok.kde.org/
-Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# From amarok svn, r871433 (Note that this was reverted later, I believe the
-# reasoning for reverting was incorrect. -- tmz :)
Patch0: amarok-libgpod-0.7.0.patch
-Patch1: amarok-2.0.1.1-gcc44.patch
-# qtscriptgenerator review, http://bugzilla.redhat.com/489550
-%define no_qtscriptgenerator 1
-Patch2: amarok-2.0.2-no_qtscriptgenerator.patch
-
-Patch100: amarok-2.0.1.1-qt45.patch
-# https://bugs.kde.org/188678
-Patch101: amarok-2.0.2-fix_lastfm_auth.patch
+Patch50: amarok-2.0.90-qtscript_not_required.patch
+
+# svn diff \
+# svn://anonsvn.kde.org/home/kde/tags/amarok/2.0.96/amarok/ \
+# svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/amarok/
+# and manually tweaked a bit to apply
+Patch100: amarok-%{snap}svn.patch.gz
BuildRequires: curl-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs4-devel
BuildRequires: libifp-devel
-BuildRequires: libgpod-devel
BuildRequires: libmp4v2-devel
%if 0%{?fedora} > 9
BuildRequires: libmtp-devel >= 0.3.0
%endif
+%if 0%{?fedora} > 10
+BuildRequires: libgpod-devel >= 0.7.0
+%endif
BuildRequires: libnjb-devel
BuildRequires: libusb-devel
BuildRequires: libxml2-devel
@@ -40,15 +41,13 @@ BuildRequires: loudmouth-devel
BuildRequires: mysql-embedded-devel
BuildRequires: soprano-devel
BuildRequires: taglib-devel
+BuildRequires: taglib-extras-devel
%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}}
-
-%if 0%{?no_qtscriptgenerator}
-#BuildRequires: qtscriptgenerator
Requires: qtscriptbindings
-%endif
+Requires: %{name}-utils = %{version}-%{release}
Obsoletes: amarok-devel < 1.4.9
Obsoletes: amarok-konqueror < 1.5
@@ -62,23 +61,22 @@ 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 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.
+
%prep
%setup -q
-%if "%(pkg-config --modversion libgpod-1.0)" >= "0.7.0"
%patch0 -p0 -b .libgpod-0.7.0
-%endif
-
-%patch1 -p1 -b .gcc4
-%if 0%{?no_qtscriptgenerator}
-%patch2 -p1 -b .no_qtscriptgenerator
-rm -rf src/scriptengine/generator
-%else
-%{?_qt45:%patch100 -p0 -b .qt45}
-%endif
-%patch101 -p0 -b .fix_lastfm_auth
+%patch100 -p0 -b .svn
+%patch50 -p1 -b .qtscript_not_required
%build
@@ -96,9 +94,11 @@ rm -rf %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}
%find_lang amarok
+%find_lang amarokcollectionscanner_qt
# unpackaged files
rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud}.so
+rm -f %{buildroot}%{_kde4_libdir}/libmediadevicelib.so
%check
@@ -129,28 +129,48 @@ fi
%files -f amarok.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
-%{_kde4_bindir}/*
+%{_kde4_bindir}/amarok
+%{_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_configdir}/*
+%{_kde4_configdir}/amarok.knsrc
+%{_kde4_configdir}/amarok_homerc
%{_kde4_datadir}/applications/kde4/amarok.desktop
-%{_kde4_datadir}/config.kcfg/*
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/config.kcfg/amarokconfig.kcfg
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/*.protocol
+%{_kde4_datadir}/kde4/services/ServiceMenus/amarok_append.desktop
%{_kde4_datadir}/kde4/servicetypes/*.desktop
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_libdir}/kde4/*.so
-%if ! 0%{?no_qtscriptgenerator}
-%{_kde4_libdir}/kde4/plugins/script/*.so
-%endif
%{_kde4_libdir}/libamarok*.so.*
+%{_kde4_libdir}/libmediadevicelib.so.*
%{_kde4_libdir}/libamarok_service_liblastfm.so
%{_kde4_libdir}/strigi/*
%{_datadir}/dbus-1/interfaces/*.xml
+%files utils -f amarokcollectionscanner_qt.lang
+%defattr(-,root,root,-)
+%{_kde4_bindir}/amarokcollectionscanner
+
%changelog
+* Mon May 18 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.96-2.20090518
+- 20090518svn snapshot
+
+* Mon May 11 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.96-1
+- amarok-2.9.96 (2.1 beta2)
+- -utilities -> -utils
+
+* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.90-2
+- -collectionscanner -> -utilities
+
+* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.90-1
+- amarok-2.0.90 (amarok-2.1 beta1)
+
* Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-6
- fix lastfm (kdebug#188678, rhbz#494871)
- fix qtscriptgenerator/qtscriptbindings deps
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources 5 Mar 2009 16:49:30 -0000 1.44
+++ sources 18 May 2009 16:37:14 -0000 1.45
@@ -1 +1,2 @@
-98b78372ec6ea3432faba356c90c6dbe amarok-2.0.2.tar.bz2
+04239b2fec6e8dd8b2ea89db0779e196 amarok-2.0.96.tar.bz2
+55a55c44af648f6bf3f8db5b561c1c1b amarok-20090518svn.patch.gz
--- amarok-2.0.1.1-gcc44.patch DELETED ---
--- amarok-2.0.1.1-qt45.patch DELETED ---
--- amarok-2.0.2-fix_lastfm_auth.patch DELETED ---
--- amarok-2.0.2-no_qtscriptgenerator.patch DELETED ---
--- amarok-libgpod-0.7.0.patch DELETED ---
More information about the fedora-extras-commits
mailing list