rpms/amarok/devel .cvsignore, 1.43, 1.44 amarok.spec, 1.145, 1.146 sources, 1.44, 1.45 amarok-2.0.1.1-gcc44.patch, 1.3, 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

Fri Apr 10 15:32:29 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6360

Modified Files:
	.cvsignore amarok.spec sources 
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:
* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.90-1
- amarok-2.0.90 (amarok-2.1 beta1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44

--- .cvsignore	5 Mar 2009 12:49:20 -0000	1.43
+++ .cvsignore	10 Apr 2009 15:31:58 -0000	1.44
@@ -1 +1 @@
-amarok-2.0.2.tar.bz2
+amarok-2.0.90.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- amarok.spec	8 Apr 2009 17:09:13 -0000	1.145
+++ amarok.spec	10 Apr 2009 15:31:58 -0000	1.146
@@ -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 @@
  - 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 @@
 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 @@
 %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 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/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	5 Mar 2009 12:49:20 -0000	1.44
+++ sources	10 Apr 2009 15:31:58 -0000	1.45
@@ -1 +1 @@
-98b78372ec6ea3432faba356c90c6dbe  amarok-2.0.2.tar.bz2
+6c904ac95926e383cd1c1c32aa3c1f0f  amarok-2.0.90.tar.bz2


--- 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 ---


