public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Rex Dieter <rdieter@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/amarok] epel10: - amarok-2.0.90 (amarok-2.1 beta1)
Date: Mon, 06 Jul 2026 18:04:10 GMT [thread overview]
Message-ID: <178336105013.1.4632671306172018722.rpms-amarok-d4fff5d93ab6@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/amarok
Branch : epel10
Commit : d4fff5d93ab6c5ddb75f39c99c369314a85e1da5
Author : Rex Dieter <rdieter@fedoraproject.org>
Date : 2009-04-10T15:31:58+00:00
Stats : +35/-260 in 8 file(s)
URL : https://src.fedoraproject.org/rpms/amarok/c/d4fff5d93ab6c5ddb75f39c99c369314a85e1da5?branch=epel10
Log:
- amarok-2.0.90 (amarok-2.1 beta1)
---
diff --git a/.cvsignore b/.cvsignore
index 5e71338..20a2701 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-2.0.2.tar.bz2
+amarok-2.0.90.tar.bz2
diff --git a/amarok-2.0.1.1-gcc44.patch b/amarok-2.0.1.1-gcc44.patch
deleted file mode 100644
index 764a9ec..0000000
--- a/amarok-2.0.1.1-gcc44.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -up amarok-2.0.1.1/src/metadata/audible/audibletag.cpp.orig amarok-2.0.1.1/src/metadata/audible/audibletag.cpp
---- amarok-2.0.1.1/src/metadata/audible/audibletag.cpp.orig 2009-02-24 17:53:43.000000000 +0100
-+++ amarok-2.0.1.1/src/metadata/audible/audibletag.cpp 2009-02-24 17:54:03.000000000 +0100
-@@ -25,6 +25,7 @@
-
- #include "audibletag.h"
-
-+#include <cstdio>
- #include <tag.h>
- #include <string.h>
- #include <stdlib.h>
-diff -up amarok-2.0.1.1/src/metadata/audible/taglib_audiblefile.cpp.orig amarok-2.0.1.1/src/metadata/audible/taglib_audiblefile.cpp
---- amarok-2.0.1.1/src/metadata/audible/taglib_audiblefile.cpp.orig 2009-02-24 18:22:41.000000000 +0100
-+++ amarok-2.0.1.1/src/metadata/audible/taglib_audiblefile.cpp 2009-02-24 18:23:05.000000000 +0100
-@@ -28,6 +28,7 @@
- #include "audibletag.h"
- #include "../tfile_helper.h"
- #include <audioproperties.h>
-+#include <cstdio>
- #include <string.h>
-
- namespace TagLib {
-diff -up amarok-2.0.1.1/src/metadata/audible/taglib_audiblefiletyperesolver.cpp.orig amarok-2.0.1.1/src/metadata/audible/taglib_audiblefiletyperesolver.cpp
---- amarok-2.0.1.1/src/metadata/audible/taglib_audiblefiletyperesolver.cpp.orig 2009-02-24 18:23:44.000000000 +0100
-+++ amarok-2.0.1.1/src/metadata/audible/taglib_audiblefiletyperesolver.cpp 2009-02-24 18:23:57.000000000 +0100
-@@ -22,6 +22,7 @@
- #include "taglib_audiblefiletyperesolver.h"
- #include "taglib_audiblefile.h"
-
-+#include <cstdio>
- #include <string.h>
-
- TagLib::File *AudibleFileTypeResolver::createFile(TagLib::FileName fileName,
-diff -up amarok-2.0.1.1/src/metadata/wav/wavfile.cpp.orig amarok-2.0.1.1/src/metadata/wav/wavfile.cpp
---- amarok-2.0.1.1/src/metadata/wav/wavfile.cpp.orig 2009-02-24 18:24:38.000000000 +0100
-+++ amarok-2.0.1.1/src/metadata/wav/wavfile.cpp 2009-02-24 18:25:01.000000000 +0100
-@@ -27,6 +27,7 @@
-
- #include "../tfile_helper.h"
- #include <audioproperties.h>
-+#include <cstdio>
- #include <tag.h>
-
- namespace TagLib {
-diff -up amarok-2.0.1.1/src/metadata/wav/wavfiletyperesolver.cpp.orig amarok-2.0.1.1/src/metadata/wav/wavfiletyperesolver.cpp
---- amarok-2.0.1.1/src/metadata/wav/wavfiletyperesolver.cpp.orig 2009-02-24 18:26:23.000000000 +0100
-+++ amarok-2.0.1.1/src/metadata/wav/wavfiletyperesolver.cpp 2009-02-24 18:26:36.000000000 +0100
-@@ -22,6 +22,7 @@
- #include "wavfiletyperesolver.h"
- #include "wavfile.h"
-
-+#include <cstdio>
- #include <string.h>
-
- TagLib::File *WavFileTypeResolver::createFile(TagLib::FileName fileName,
-diff -up amarok-2.0.1.1/src/metadata/wav/wavproperties.cpp.orig amarok-2.0.1.1/src/metadata/wav/wavproperties.cpp
---- amarok-2.0.1.1/src/metadata/wav/wavproperties.cpp.orig 2009-02-24 18:25:40.000000000 +0100
-+++ amarok-2.0.1.1/src/metadata/wav/wavproperties.cpp 2009-02-24 18:25:52.000000000 +0100
-@@ -25,6 +25,7 @@
-
- #include "wavproperties.h"
-
-+#include <cstdio>
- #include <tstring.h>
- #include <stdint.h>
-
-diff -up amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp.gcc4 amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp
---- amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp.gcc4 2009-01-06 13:49:08.000000000 +0100
-+++ amarok-2.0.1.1/src/metadata/audible/audibleproperties.cpp 2009-02-24 16:33:55.000000000 +0100
-@@ -22,6 +22,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, *
- * MA 02110-1301 USA *
- ***************************************************************************/
-+#include <cstdio>
-
- #include "audibleproperties.h"
-
-diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h.gcc4 amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h
---- amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h.gcc4 2009-02-24 16:41:44.000000000 +0100
-+++ amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/pp-internal.h 2009-02-24 16:42:48.000000000 +0100
-@@ -15,6 +15,7 @@
- #ifndef PP_INTERNAL_H
- #define PP_INTERNAL_H
-
-+#include <cstdio>
- #include <algorithm>
-
- namespace rpp {
-diff -up amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp.gcc4 amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp
---- amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp.gcc4 2009-01-06 13:50:11.000000000 +0100
-+++ amarok-2.0.1.1/src/scriptengine/generator/generator/parser/rpp/preprocessor.cpp 2009-02-24 16:33:55.000000000 +0100
-@@ -14,6 +14,7 @@
-
- #include "preprocessor.h"
-
-+#include <cstdio>
- #include <string>
-
- // register callback for include hooks
diff --git a/amarok-2.0.1.1-qt45.patch b/amarok-2.0.1.1-qt45.patch
deleted file mode 100644
index 585bb6b..0000000
--- a/amarok-2.0.1.1-qt45.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: src/scriptengine/generator/generator/typesystem_gui.xml
-===================================================================
---- src/scriptengine/generator/generator/typesystem_gui.xml (revision 926173)
-+++ src/scriptengine/generator/generator/typesystem_gui.xml (working copy)
-@@ -5389,8 +5389,13 @@
- <object-type name="QInputContextPlugin"/>
- <object-type name="QPictureFormatPlugin"/>
- <object-type name="QStylePlugin"/>
-- <object-type name="QTextCodecPlugin"/>
--
-+
-+ <object-type name="QTextCodecPlugin">
-+ <inject-code class="shell" position="beginning">
-+Q_DECLARE_METATYPE(QList<int>)
-+ </inject-code>
-+ </object-type>
-+
- <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::QPixmap', unmatched parameter type 'QPixmapData*'"/>
- <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&'"/>
- <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/>
-Index: src/scriptengine/generator/generator/shellimplgenerator.cpp
-===================================================================
---- src/scriptengine/generator/generator/shellimplgenerator.cpp (revision 926173)
-+++ src/scriptengine/generator/generator/shellimplgenerator.cpp (working copy)
-@@ -105,6 +105,7 @@
- declareFunctionMetaTypes(s, functions, registeredTypeNames);
- s << endl;
- }
-+ writeInjectedCode(s, meta_class);
-
- // write constructors
- foreach (const AbstractMetaFunction *ctor, ctors) {
-
diff --git a/amarok-2.0.2-fix_lastfm_auth.patch b/amarok-2.0.2-fix_lastfm_auth.patch
deleted file mode 100644
index cb47d0a..0000000
--- a/amarok-2.0.2-fix_lastfm_auth.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/services/lastfm/LastFmServiceSettings.cpp
-+++ src/services/lastfm/LastFmServiceSettings.cpp
-@@ -94,14 +94,12 @@
- debug() << "username:" << QString( QUrl::toPercentEncoding( Ws::Username ) );
-
- QString authToken = md5( ( m_configDialog->kcfg_ScrobblerUsername->text() + md5( m_configDialog->kcfg_ScrobblerPassword->text().toUtf8() ) ).toUtf8() );
-- QString sign_key = md5( ( "api_key" + QString( Ws::ApiKey ) + "authToken" + authToken + "methodauth.getMobileSession" + QString( Ws::SharedSecret ) ).toUtf8() );
-
- // now authenticate w/ last.fm and get our session key
- WsReply* reply = WsRequestBuilder( "auth.getMobileSession" )
- .add( "username", m_configDialog->kcfg_ScrobblerUsername->text() )
- .add( "authToken", authToken )
- .add( "api_key", Ws::ApiKey )
-- .add( "api_sig", sign_key )
- .get();
-
- connect( reply, SIGNAL( finished( WsReply* ) ), SLOT( onAuthenticated( WsReply* ) ) );
---- src/services/lastfm/LastFmService.cpp
-+++ src/services/lastfm/LastFmService.cpp
-@@ -115,14 +115,12 @@
- debug() << "username:" << QString( QUrl::toPercentEncoding( Ws::Username ) );
-
- QString authToken = md5( ( m_userName + md5( password.toUtf8() ) ).toUtf8() );
-- QString sign_key = md5( ( "api_key" + QString( Ws::ApiKey ) + "authToken" + authToken + "methodauth.getMobileSession" + QString( Ws::SharedSecret ) ).toUtf8() );
-
- // now authenticate w/ last.fm and get our session key
- WsReply* reply = WsRequestBuilder( "auth.getMobileSession" )
- .add( "username", m_userName )
- .add( "authToken", authToken )
- .add( "api_key", Ws::ApiKey )
-- .add( "api_sig", sign_key )
- .get();
-
- connect( reply, SIGNAL( finished( WsReply* ) ), SLOT( onAuthenticated( WsReply* ) ) );
diff --git a/amarok-2.0.2-no_qtscriptgenerator.patch b/amarok-2.0.2-no_qtscriptgenerator.patch
deleted file mode 100644
index a35c947..0000000
--- a/amarok-2.0.2-no_qtscriptgenerator.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up amarok-2.0.2/CMakeLists.txt.no_qtscriptgenerator amarok-2.0.2/CMakeLists.txt
---- amarok-2.0.2/CMakeLists.txt.no_qtscriptgenerator 2009-03-01 11:36:24.000000000 -0600
-+++ amarok-2.0.2/CMakeLists.txt 2009-03-10 13:37:21.000000000 -0500
-@@ -20,7 +20,7 @@ set( CMAKE_MODULE_PATH ${CMAKE_MODULE
-
- #this line has to be before add_defintions, but after the KDE4 cmake includes
- #because they are used to determine install locations
--add_subdirectory( src/scriptengine/generator )
-+#add_subdirectory( src/scriptengine/generator )
- add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-
- include(CheckLibraryExists)
diff --git a/amarok-libgpod-0.7.0.patch b/amarok-libgpod-0.7.0.patch
deleted file mode 100644
index a1a6077..0000000
--- a/amarok-libgpod-0.7.0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: src/collection/ipodcollection/handler/IpodHandler.cpp
-===================================================================
---- src/collection/ipodcollection/handler/IpodHandler.cpp (revision 871432)
-+++ src/collection/ipodcollection/handler/IpodHandler.cpp (revision 871434)
-@@ -1025,12 +1025,17 @@
- QFileInfo tempImageFileInfo( tempImageFile ); // get info for path
- QString tempImagePath = tempImageFileInfo.absoluteFilePath(); // path
-
-+#ifdef ITDB_THUMB_COVER_SMALL
- Itdb_Thumb *thumb = NULL;
-+#endif
- GdkPixbuf *gpixbuf = NULL;
- QString thumbPath;
-
- // pull image out of ipod
-
-+#ifdef ITDB_THUMB_COVER_SMALL
-+ // we've got libgpod 0.6.0 here
-+
- if( ipodtrack->has_artwork == 0x01 )
- {
- // try small first
-@@ -1115,7 +1120,15 @@
- }
- }
- }
-+#else
-+ // libgpod 0.7.0
-
-+ if( itdb_track_has_thumbnails ( ipodtrack ) )
-+ {
-+ gpixbuf = (GdkPixbuf*) itdb_track_get_thumbnail (ipodtrack, -1, -1 );
-+ }
-+#endif
-+
- if(gpixbuf != NULL)
- {
- // temporarily save to file
diff --git a/amarok.spec b/amarok.spec
index 142ad31..0313de6 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,54 +1,42 @@
Name: amarok
Summary: Media player
-Version: 2.0.2
-Release: 6%{?dist}
+Version: 2.0.90
+Release: 1%{?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
-
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
BuildRequires: loudmouth-devel
BuildRequires: mysql-embedded-devel
+BuildRequires: qtscriptgenerator
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}-collectionscanner = %{version}-%{release}
Obsoletes: amarok-devel < 1.4.9
Obsoletes: amarok-konqueror < 1.5
@@ -62,24 +50,16 @@ 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 collectionscanner
+Summary: Amarok standalone collection scanner
+Group: Applications/Multimedia
+%description collectionscanner
+%{summary}.
+
%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
-
%build
mkdir -p %{_target_platform}
@@ -96,9 +76,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 +111,37 @@ 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_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 collectionscanner -f amarokcollectionscanner_qt.lang
+%defattr(-,root,root,-)
+%{_kde4_bindir}/amarokcollectionscanner
+
%changelog
+* Fri Apr 10 2009 Rex Dieter <rdieter@fedoraproject.org> 2.0.90-1
+- amarok-2.0.90 (amarok-2.1 beta1)
+
* Wed Apr 08 2009 Rex Dieter <rdieter@fedoraproject.org> 2.0.2-6
- fix lastfm (kdebug#188678, rhbz#494871)
- fix qtscriptgenerator/qtscriptbindings deps
diff --git a/sources b/sources
index aab67d5..c57c276 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-98b78372ec6ea3432faba356c90c6dbe amarok-2.0.2.tar.bz2
+6c904ac95926e383cd1c1c32aa3c1f0f amarok-2.0.90.tar.bz2
reply other threads:[~2026-07-06 18:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178336105013.1.4632671306172018722.rpms-amarok-d4fff5d93ab6@fedoraproject.org \
--to=rdieter@fedoraproject.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox