rpms/amarok/F-8 amarok-1.4.8-gcc43.patch, 1.1, 1.2 amarok.spec, 1.94, 1.95 sources, 1.32, 1.33
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Apr 16 13:11:37 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/amarok/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11039
Modified Files:
amarok-1.4.8-gcc43.patch amarok.spec sources
Log Message:
* Tue Apr 15 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.4.9.1-1
- amarok-1.4.9.1
amarok-1.4.8-gcc43.patch:
Index: amarok-1.4.8-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-8/amarok-1.4.8-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amarok-1.4.8-gcc43.patch 22 Feb 2008 04:03:30 -0000 1.1
+++ amarok-1.4.8-gcc43.patch 16 Apr 2008 13:11:30 -0000 1.2
@@ -5,7 +5,7 @@
#include <audioproperties.h>
#include <stdint.h>
-+#include <stdlib.h>
++#include <cstdlib>
#define MP4V2_HAS_WRITE_BUG 1
@@ -16,7 +16,7 @@
#include "taglib_mp4filetyperesolver.h"
#include "mp4file.h"
-+#include <string.h>
++#include <cstring>
TagLib::File *MP4FileTypeResolver::createFile(const char *fileName,
bool readProperties,
@@ -27,8 +27,8 @@
#include <tag.h>
#include <stdint.h>
-+#include <stdlib.h>
-+#include <string.h>
++#include <cstdlib>
++#include <cstring>
using namespace TagLib;
@@ -39,7 +39,7 @@
#endif
#include <stdint.h>
-+#include <string.h>
++#include <cstring>
#ifndef UINT64_TO_DOUBLE
#define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))
@@ -50,8 +50,8 @@
the alsa guys
***************************************************************************/
-+#include <stdlib.h>
-+#include <string.h>
++#include <cstdlib>
++#include <cstring>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/wait.h>
@@ -62,7 +62,7 @@
#include <limits.h>
#include <sys/param.h>
#include <pthread.h>
-+#include <string.h>
++#include <cstring>
#include <vector>
#include <config.h>
#include <iostream>
@@ -73,7 +73,7 @@
#include <climits>
#include <cmath>
#include <stdarg.h>
-+#include <string.h>
++#include <cstring>
#include <config.h>
Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-8/amarok.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- amarok.spec 12 Mar 2008 17:56:57 -0000 1.94
+++ amarok.spec 16 Apr 2008 13:11:30 -0000 1.95
@@ -1,20 +1,35 @@
# TODO:
# Rio Karma support : libkarma
-%define _with_mp4v2 --with-mp4v2
-
-%if 0%{?fedora} < 9
+%if 0%{?fedora} < 9
+# define to include konquisidebar support for kde3 desktop
%define konq 1
%endif
+%if 0%{?fedora} > 6
+# suffix for kde3 -devel packages
+%define kde3 3
+%endif
+%if 0%{?fedora} > 6
+# Helix engine on archs where it is available
%ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 alpha
+# consider omitting helix support, srsly, does *anyone* use it? -- Rex
%define _with_helix --with-helix=%{_libdir}/helix
%endif
+%endif
+
+%if 0%{?fedora}
+%define _with_ifp --with-ifp
+%define _with_libgpod --with-libgpod
+%define _with_libmtp --with-libmtp
+%define _with_libnjb --with-libnjb
+%define _with_mp4v2 --with-mp4v2
+%endif
Name: amarok
Summary: Media player
-Version: 1.4.8
-Release: 5%{?dist}
+Version: 1.4.9.1
+Release: 1%{?dist}
Group: Applications/Multimedia
License: GPLv2+
@@ -30,31 +45,27 @@
BuildRequires: desktop-file-utils
BuildRequires: esound-devel
BuildRequires: gettext
-## Gstreamer engine, disabled indefinitely, see:
-## http://amarok.kde.org/blog/archives/91-Backends,-Phonon,-GStreamer.html
-#define _with_gstreamer --with-gstreamer10
-%{?_with_gstreamer: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 sparc sparc64 alpha
-BuildRequires: HelixPlayer
-%endif
-BuildRequires: kdelibs3-devel
+%{?_with_helix:BuildRequires: HelixPlayer}
+BuildRequires: kdelibs%{?kde3}-devel
%if 0%{?konq}
-BuildRequires: kdebase3-devel
+BuildRequires: kdebase%{?kde3}-devel
%else
Obsoletes: %{name}-konqueror < %{version}-%{release}
%endif
BuildRequires: taglib-devel
-BuildRequires: libifp-devel
+%{?_with_ifp:BuildRequires: libifp-devel}
# Ipod
-BuildRequires: libgpod-devel
+%{?_with_libgpod:BuildRequires: libgpod-devel}
%{?_with_mp4v2:BuildRequires: libmp4v2-devel}
# MTP players
-BuildRequires: libmtp-devel
+%{?_with_libmtp:BuildRequires: libmtp-devel}
BuildRequires: libmusicbrainz-devel
# Creative Nomad Jukebox
-BuildRequires: libnjb-devel
+%{?_with_njb:BuildRequires: libnjb-devel}
+BuildRequires: libtool
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
BuildRequires: libtool-ltdl-devel
+%endif
BuildRequires: libtunepimp-devel
BuildRequires: libusb-devel
BuildRequires: libvisual-devel
@@ -64,17 +75,16 @@
BuildRequires: SDL-devel
BuildRequires: taglib-devel
BuildRequires: xine-lib-devel
-BuildRequires: xmms-devel
+# not used anymore, in favor of libvisual ? -- Rex
+#BuildRequires: xmms-devel
-# For some default plugins (lyrics)
-Requires(hint): ruby
-
-# Bug 245386
-%global kdelibs_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.8) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
-Requires: kdelibs3 >= %{kdelibs_ver}
+# For dir ownership and some default plugins (lyrics), -ruby subpkg? -- Rex
+Requires: ruby
# To open the selected browser, works with Patch2
Requires: xdg-utils
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
@@ -91,8 +101,6 @@
Provides: %{name}-engine-xine = %{version}-%{release}
-
-
%description
Amarok is a multimedia player with:
- fresh playlist concept, very fast to use, with drag and drop
@@ -101,9 +109,11 @@
- compatible with the .m3u and .pls formats for playlists
- nice GUI, integrates into the KDE look, but with a unique touch
+%if 0%{?_with_helix:1}
Amarok can use various engines to decode sound : helix and xine.
-To use the helix engine, you'll have to install either HelixPlayer
+To use the helix engine, you need to install either HelixPlayer
or RealPlayer
+%endif
%package konqueror
Summary: Amarok konqueror (service menus, sidebar) support
@@ -124,7 +134,6 @@
use any of xmms' visualisation plugins with Amarok.
-
%prep
%setup -q
@@ -140,10 +149,11 @@
--disable-rpath \
--enable-mysql \
--enable-postgresql \
- --with-ifp \
- --with-libgpod \
%{?_with_helix} %{!?_with_helix:--without-helix} \
- %{?_with_gstreamer} \
+ %{?_with_ifp} %{!?_with_ifp:--without-ifp} \
+ %{?_with_libgpod} %{!?_with_libgpod:--without-libgpod} \
+ %{?_with_libmtp} %{!?_with_libmtp:--without-libmtp} \
+ %{?_with_libnjb} %{!?_with_libnjb:--without-libnjb \
%{?_with_mp4v2} %{!?_with_mp4v2:--without-mp4v2}
# --enable-final \
@@ -185,21 +195,13 @@
%post
/sbin/ldconfig
-# update icon themes if necessary
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-update-desktop-database &> /dev/null ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
%postun
/sbin/ldconfig
-# update icon themes if necessary
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-update-desktop-database &> /dev/null ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
%clean
@@ -214,7 +216,7 @@
%{_bindir}/amarokcollectionscanner
%{_bindir}/amarok_proxy.rb
%{_datadir}/apps/amarok/
-%{_datadir}/icons/hicolor/*/*
+%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/applications/kde/*.desktop
%{_datadir}/servicetypes/*.desktop
%{_datadir}/apps/profiles/amarok.profile.xml
@@ -223,7 +225,9 @@
%{_datadir}/services/amarokitpc.protocol
%{_datadir}/services/amaroklastfm.protocol
%{_datadir}/services/amarokpcast.protocol
+# -libs ? -- Rex
%{_libdir}/libamarok.*
+# -ruby ? -- Rex
%{_libdir}/ruby_lib/*
# DAAP
%{_bindir}/amarok_daapserver.rb
@@ -238,21 +242,29 @@
# SMB
%{_datadir}/services/amarok_smb-device.desktop
%{_libdir}/kde3/libamarok_smb-device.*
+%if 0%{?_with_libgpod:1}
# IPod
%{_datadir}/services/amarok_ipod-mediadevice.desktop
%{_libdir}/kde3/libamarok_ipod-mediadevice.*
+%endif
# VFAT
%{_datadir}/services/amarok_generic-mediadevice.desktop
%{_libdir}/kde3/libamarok_generic-mediadevice.*
+%if 0%{?_with_ifp:1}
# iRiver
%{_datadir}/services/amarok_ifp-mediadevice.desktop
%{_libdir}/kde3/libamarok_ifp-mediadevice.*
+%endif
+%if 0%{?_with_njb:1}
# Creative Zen
%{_datadir}/services/amarok_njb-mediadevice.desktop
%{_libdir}/kde3/libamarok_njb-mediadevice.*
+%endif
+%if 0%{?_with_libmtp:1}
# MTP players
%{_datadir}/services/amarok_mtp-mediadevice.desktop
%{_libdir}/kde3/libamarok_mtp-mediadevice.*
+%endif
# Rio Karma
#%{_datadir}/services/amarok_riokarma-mediadevice.desktop
#%{_libdir}/kde3/libamarok_riokarma-mediadevice.*
@@ -285,6 +297,9 @@
%changelog
+* Tue Apr 15 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.4.9.1-1
+- amarok-1.4.9.1
+
* Wed Mar 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.4.8-5
- -konqueror: drop Obsoletes: %%name < 1.4.8-4 , which breaks
multilib upgrades (#436578)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-8/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources 21 Dec 2007 17:29:54 -0000 1.32
+++ sources 16 Apr 2008 13:11:30 -0000 1.33
@@ -1 +1 @@
-7f65c4a8f3f0ff9042a5b5dd21b36cc8 amarok-1.4.8.tar.bz2
+aa588778379a391ad3f4b3fc770217e4 amarok-1.4.9.1.tar.bz2
More information about the fedora-extras-commits
mailing list