[amarok] 2.6.90
Rex Dieter
rdieter at fedoraproject.org
Fri Dec 14 17:32:48 UTC 2012
commit f922ba2ca3de1c5ac039c6b635ffa560e1dcc49d
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Fri Dec 14 11:32:45 2012 -0600
2.6.90
.gitignore | 1 +
amarok-2.2.1.90-qtscript_not_required.patch | 14 -
amarok-2.5.96-liblastfm1.patch | 706 --------------------
amarok-2.6.90-ipod_dso.patch | 11 +
...nlinedoc.patch => amarok-2.6.90-onlinedoc.patch | 30 +-
amarok.spec | 41 +-
sources | 3 +-
7 files changed, 43 insertions(+), 763 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a5a815f..000519c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/amarok-2.6.0.tar.bz2
/amarok-fr_po.patch.bz2
+/amarok-2.6.90.tar.bz2
diff --git a/amarok-2.6.90-ipod_dso.patch b/amarok-2.6.90-ipod_dso.patch
new file mode 100644
index 0000000..5e12103
--- /dev/null
+++ b/amarok-2.6.90-ipod_dso.patch
@@ -0,0 +1,11 @@
+diff -up amarok-2.6.90/src/core-impl/collections/ipodcollection/CMakeLists.txt.dso amarok-2.6.90/src/core-impl/collections/ipodcollection/CMakeLists.txt
+--- amarok-2.6.90/src/core-impl/collections/ipodcollection/CMakeLists.txt.dso 2012-12-13 06:54:53.000000000 -0600
++++ amarok-2.6.90/src/core-impl/collections/ipodcollection/CMakeLists.txt 2012-12-14 11:16:15.201095371 -0600
+@@ -61,6 +61,7 @@ if(IPOD_FOUND AND WITH_IPOD)
+ ${QT_QTGUI_LIBRARY}
+ ${GLIB2_LIBRARIES}
+ ${GDKPIXBUF_LIBRARY}
++ ${GOBJECT_LIBRARIES}
+ ${IPOD_LIBRARIES}
+ )
+
diff --git a/amarok-2.5.0-onlinedoc.patch b/amarok-2.6.90-onlinedoc.patch
similarity index 75%
rename from amarok-2.5.0-onlinedoc.patch
rename to amarok-2.6.90-onlinedoc.patch
index dc731d4..51f3667 100644
--- a/amarok-2.5.0-onlinedoc.patch
+++ b/amarok-2.6.90-onlinedoc.patch
@@ -1,9 +1,9 @@
-diff -ur amarok-2.5.0/src/ActionClasses.cpp amarok-2.5.0-onlinedoc/src/ActionClasses.cpp
---- amarok-2.5.0/src/ActionClasses.cpp 2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0-onlinedoc/src/ActionClasses.cpp 2012-01-29 08:23:50.000000000 +0100
-@@ -31,10 +31,12 @@
- #include "playlist/PlaylistActions.h"
+diff -up amarok-2.6.90/src/ActionClasses.cpp.onlinedoc amarok-2.6.90/src/ActionClasses.cpp
+--- amarok-2.6.90/src/ActionClasses.cpp.onlinedoc 2012-12-13 06:54:53.000000000 -0600
++++ amarok-2.6.90/src/ActionClasses.cpp 2012-12-14 10:06:34.612852727 -0600
+@@ -33,10 +33,12 @@
#include "playlist/PlaylistModelStack.h"
+ #include "widgets/Osd.h"
+#include <QFile>
#include <KAuthorized>
@@ -11,10 +11,10 @@ diff -ur amarok-2.5.0/src/ActionClasses.cpp amarok-2.5.0-onlinedoc/src/ActionCla
#include <KLocale>
#include <KToolBar>
+#include <KToolInvocation>
- #include <Osd.h>
- #include <EqualizerDialog.h>
-@@ -63,6 +65,7 @@
+ extern OcsData ocsData;
+
+@@ -62,6 +64,7 @@ namespace Amarok
using namespace Amarok;
KHelpMenu *Menu::s_helpMenu = 0;
@@ -22,7 +22,7 @@ diff -ur amarok-2.5.0/src/ActionClasses.cpp amarok-2.5.0-onlinedoc/src/ActionCla
static void
safePlug( KActionCollection *ac, const char *name, QWidget *w )
-@@ -152,6 +155,20 @@
+@@ -151,6 +154,20 @@ Menu::helpMenu( QWidget *parent ) //STAT
KMenu* menu = s_helpMenu->menu();
@@ -43,7 +43,7 @@ diff -ur amarok-2.5.0/src/ActionClasses.cpp amarok-2.5.0-onlinedoc/src/ActionCla
// NOTE: We hide "Report Bug..." because we need to add it on our own to name the dialog
// so it can be blacklisted from LikeBack.
s_helpMenu->action( KHelpMenu::menuReportBug )->setVisible( false );
-@@ -164,6 +181,17 @@
+@@ -163,6 +180,17 @@ Menu::helpMenu( QWidget *parent ) //STAT
return menu;
}
@@ -61,10 +61,10 @@ diff -ur amarok-2.5.0/src/ActionClasses.cpp amarok-2.5.0-onlinedoc/src/ActionCla
//////////////////////////////////////////////////////////////////////////////////////////
// PlayPauseAction
//////////////////////////////////////////////////////////////////////////////////////////
-diff -ur amarok-2.5.0/src/ActionClasses.h amarok-2.5.0-onlinedoc/src/ActionClasses.h
---- amarok-2.5.0/src/ActionClasses.h 2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0-onlinedoc/src/ActionClasses.h 2012-01-29 08:08:13.000000000 +0100
-@@ -34,6 +34,16 @@
+diff -up amarok-2.6.90/src/ActionClasses.h.onlinedoc amarok-2.6.90/src/ActionClasses.h
+--- amarok-2.6.90/src/ActionClasses.h.onlinedoc 2012-12-13 06:54:53.000000000 -0600
++++ amarok-2.6.90/src/ActionClasses.h 2012-12-14 10:05:43.738430447 -0600
+@@ -34,6 +34,16 @@ class KHelpMenu;
namespace Amarok
{
@@ -81,7 +81,7 @@ diff -ur amarok-2.5.0/src/ActionClasses.h amarok-2.5.0-onlinedoc/src/ActionClass
class Menu : public KMenu
{
Q_OBJECT
-@@ -45,6 +55,7 @@
+@@ -45,6 +55,7 @@ namespace Amarok
private:
static Menu *s_instance;
static KHelpMenu *s_helpMenu;
diff --git a/amarok.spec b/amarok.spec
index ee27212..5e7c5ca 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,8 +1,8 @@
Name: amarok
Summary: Media player
-Version: 2.6.0
-Release: 7%{?dist}
+Version: 2.6.90
+Release: 1%{?dist}
# KDE e.V. may determine that future GPL versions are accepted
License: GPLv2 or GPLv3
@@ -14,31 +14,23 @@ Url: http://amarok.kde.org/
%global stable stable
%endif
Source0: http://download.kde.org/%{stable}/amarok/%{version}/src/amarok-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# 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
+Patch0: amarok-2.6.90-onlinedoc.patch
-#Patch50: amarok-2.2.1.90-qtscript_not_required.patch
+## upstreamable patches
+Patch50: amarok-2.6.90-ipod_dso.patch
## upstream patches
-# liblastfm1 support
-# https://git.reviewboard.kde.org/r/105276/
-Patch100: amarok-2.5.96-liblastfm1.patch
-%if 0%{?fedora} > 15
-%define liblastfm1 1
-%endif
-# french translations
-Patch110: amarok-fr_po.patch.bz2
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 >= 4.6.0
-BuildRequires: liblastfm-devel%{?liblastfm1: >= 1.0}
+BuildRequires: kdelibs4-devel >= 4.9
+BuildRequires: liblastfm-devel >= 1.0
# extra libaio linkage comes from use of mysql_config --libs
BuildRequires: mysql-embedded-devel libaio-devel
BuildRequires: pkgconfig(libgpod-1.0) >= 0.7.0
@@ -58,8 +50,7 @@ BuildRequires: qtscriptbindings
Requires: qtscriptbindings%{?_isa}
Requires: %{name}-utils = %{version}-%{release}
Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
-# aka audiocd-kio (on kde-4.9+)
-Requires: kdemultimedia-kio_audiocd
+Requires: audiocd-kio
Requires: ifuse
Requires: media-player-info
@@ -82,8 +73,6 @@ Requires: %{name} = %{version}-%{release}
%package utils
Summary: Amarok standalone utilities
-Obsoletes: amarok-collectionscanner < 2.0.90-2
-Obsoletes: amarok-utilities < 2.0.96
%description utils
%{summary}, including amarokcollectionscanner.
@@ -101,11 +90,7 @@ BuildArch: noarch
%setup -q
%patch0 -p1 -b .onlinedoc
-#patch50 -p1 -b .qtscript_not_required
-%if 0%{?liblastfm1}
-%patch100 -p1 -b .liblastfm1
-%endif
-%patch110 -p1 -b .fr_po
+%patch50 -p1 -b .ipod_dso
%build
@@ -118,8 +103,6 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
-rm -rf %{buildroot}
-
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%find_lang amarok --with-kde --without-mo && mv amarok.lang amarok-doc.lang
@@ -157,6 +140,7 @@ fi
%{_kde4_bindir}/amarokpkg
%{_kde4_bindir}/amarok_afttagger
%{_kde4_bindir}/amarokmp3tunesharmonydaemon
+%{_kde4_bindir}/amzdownloader
%{_kde4_appsdir}/amarok/
%{_kde4_appsdir}/kconf_update/amarok*
%{_kde4_appsdir}/desktoptheme/default/widgets/*
@@ -185,6 +169,8 @@ fi
%{_kde4_libdir}/libamarokpud.so.1*
%{_kde4_libdir}/libamarok-sqlcollection.so.1*
%{_kde4_libdir}/libamarok-transcoding.so.1*
+# private libs
+%{_kde4_libdir}/libamarok_service_lastfm_shared.so
%{_kde4_libdir}/libampache_account_login.so
%files utils -f amarokcollectionscanner_qt.lang
@@ -194,6 +180,9 @@ fi
%changelog
+* Fri Dec 14 2012 Rex Dieter <rdieter at fedoraproject.org> 2.6.90-1
+- 2.6.90
+
* Thu Nov 27 2012 Jan Grulich <jgrulich at redhat.com> 2.6.0-7
- rebuild (qjson)
diff --git a/sources b/sources
index c9aa4be..c0d9338 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-116f53c1109c7acd1ac7d78ec75c01c4 amarok-2.6.0.tar.bz2
-d3283ff2f2ed381f3cda9a335726881e amarok-fr_po.patch.bz2
+880612996794fed3ae5a72fba4aac61f amarok-2.6.90.tar.bz2
More information about the scm-commits
mailing list