rpms/amarok/FC-5 .cvsignore, 1.26, 1.27 amarok.spec, 1.57, 1.58 sources, 1.26, 1.27 audiocd.diff, 1.1, NONE collection.diff, 1.1, NONE mtp.diff, 1.1, NONE scanner.diff, 1.1, NONE
Aurelien Bompard (abompard)
fedora-extras-commits at redhat.com
Wed Sep 13 13:27:07 UTC 2006
- Previous message (by thread): rpms/libopensync-plugin-evolution2/devel libopensync-plugin-evolution2.spec, 1.6, 1.7 needs.rebuild, 1.1, NONE
- Next message (by thread): rpms/amarok/devel .cvsignore, 1.26, 1.27 amarok.spec, 1.57, 1.58 sources, 1.26, 1.27 audiocd.diff, 1.1, NONE collection.diff, 1.1, NONE mtp.diff, 1.1, NONE scanner.diff, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: abompard
Update of /cvs/extras/rpms/amarok/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31409/FC-5
Modified Files:
.cvsignore amarok.spec sources
Removed Files:
audiocd.diff collection.diff mtp.diff scanner.diff
Log Message:
version 1.4.3
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore 30 Aug 2006 14:16:06 -0000 1.26
+++ .cvsignore 13 Sep 2006 13:27:07 -0000 1.27
@@ -1 +1 @@
-amarok-1.4.2.tar.bz2
+amarok-1.4.3.tar.bz2
Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- amarok.spec 1 Sep 2006 14:33:20 -0000 1.57
+++ amarok.spec 13 Sep 2006 13:27:07 -0000 1.58
@@ -1,44 +1,17 @@
-%define gst10 0
-%ifarch ppc64 x86_64 s390 s390x ia64
-%define gst10 1
-%endif
-%{?_with_gst10: %define gst10 1}
-
# The amarok dev (Ian Monroe) prefers to make amarok excludearched on x86_64
# than to include the unfinished gstreamer engine (private mail following
# http://amarok.kde.org/blog/archives/210-And-How-Open-Source-Sucks-Sometimes.html )
-%define gst10 0
-
Name: amarok
Summary: Media player for KDE
-Version: 1.4.2
-Release: 2%{?dist}
+Version: 1.4.3
+Release: 1%{?dist}
Group: Applications/Multimedia
License: GPL
Url: http://amarok.kde.org
-Source0: http://mirrors.ibiblio.org/pub/mirrors/kde/stable/amarok/1.4.2/src/amarok-1.4.2.tar.bz2
-# Bring back the gstreamer engine from the beta
-#Source1: amarok-1.4.1-beta1-gst10-2.tar.bz2
-#Patch1: amarok-1.4.1-gstreamer.patch
-# Gstreamer default sink should be autoaudiosink
-#Patch2: amarok-1.4-engines-cfg.patch
-
-# Thoses patches are published by the Amarok devs
-
-# AudioCD playback would stutter and sometimes freeze Amarok. (BR 133015)
-Patch3: audiocd.diff
-# Fixed bug which prevented Amarok from creating the collection database
-# in rare circumstances using SQLite. (BR 133072)
-Patch4: collection.diff
-# MTP mediadevice support would not compile against libmtp versions >=
-# 0.0.12. (fixed in SVN revision 576121)
-Patch5: mtp.diff
-# Collection scanner would only restart a maximum of 2 times instead of
-# 20. (fixed in SVN revision 578922)
-Patch6: scanner.diff
-
+# http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
+Source0: http://mirrors.isc.org/pub/kde/stable/amarok/1.4.3/src/amarok-1.4.3.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdemultimedia-devel >= 6:3.2
@@ -59,20 +32,16 @@
BuildRequires: libgpod-devel
# Creative Nomad Jukebox
BuildRequires: libnjb-devel
-# Gstreamer engine
-%if "%{gst10}" == "1"
-BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
-%endif
+## Gstreamer engine
+#BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
# Helix engine on archs where it is available
%ifnarch ppc64 x86_64 s390 s390x ia64
BuildRequires: HelixPlayer
%endif
Requires: ruby
-# If GStreamer won't be built, Helix will be the only available engine
-%if "%{gst10}" == "0"
+# Helix is the only available engine
Requires: HelixPlayer
-%endif
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
@@ -115,24 +84,6 @@
%prep
%setup -q
-%if "%{gst10}" == "1"
-#%%setup -q -a 1
-# Bring Gstreamer back and make it a sufficient engine
-# (only engine available if Helix in unavailable)
-mv gst10 amarok/src/engine/
-%patch1 -p1 -b .gstreamer
-%patch2 -p1 -b .engines-cfg
-touch --reference aclocal.m4 amarok/src/engine/gst10/Makefile.in
-touch --reference aclocal.m4 amarok/src/engine/gst10/config/Makefile.in
-touch --reference aclocal.m4 amarok/src/engine/gst10/equalizer/Makefile.in
-%endif
-cd amarok
-%patch3 -p0 -b audiocd
-%patch4 -p0 -b collection
-%patch5 -p0 -b mtp
-%patch6 -p0 -b scanner
-cd ..
-
@@ -266,11 +217,9 @@
# Void engine (noop)
%{_datadir}/services/amarok_void-engine_plugin.desktop
%{_libdir}/kde3/libamarok_void-engine_plugin.*
-# Gstreamer engine
-%if "%{gst10}" == "1"
-%{_datadir}/services/amarok_gst10engine_plugin.desktop
-%{_libdir}/kde3/libamarok_gst10engine_plugin.*
-%endif
+## Gstreamer engine
+#%{_datadir}/services/amarok_gst10engine_plugin.desktop
+#%{_libdir}/kde3/libamarok_gst10engine_plugin.*
# Helix engine
%ifnarch ppc64 x86_64 s390 s390x ia64
%{_libdir}/kde3/libamarok_helixengine_plugin.*
@@ -288,6 +237,9 @@
%changelog
+* Wed Sep 13 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-1
+- update to 1.4.3
+
* Thu Aug 31 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.2-2
- add amarok patchset 1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources 30 Aug 2006 14:16:06 -0000 1.26
+++ sources 13 Sep 2006 13:27:07 -0000 1.27
@@ -1 +1 @@
-a1e5aac4294eb049021d1e2889c0d214 amarok-1.4.2.tar.bz2
+b0b4f8952ad23705c70815d50fd0af52 amarok-1.4.3.tar.bz2
--- audiocd.diff DELETED ---
--- collection.diff DELETED ---
--- mtp.diff DELETED ---
--- scanner.diff DELETED ---
- Previous message (by thread): rpms/libopensync-plugin-evolution2/devel libopensync-plugin-evolution2.spec, 1.6, 1.7 needs.rebuild, 1.1, NONE
- Next message (by thread): rpms/amarok/devel .cvsignore, 1.26, 1.27 amarok.spec, 1.57, 1.58 sources, 1.26, 1.27 audiocd.diff, 1.1, NONE collection.diff, 1.1, NONE mtp.diff, 1.1, NONE scanner.diff, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list