rpms/amarok/EL-5 amarok-1.4.10-libmtp03.patch, NONE, 1.1 amarok.spec, 1.84, 1.85
Rex Dieter
rdieter at fedoraproject.org
Tue Apr 14 13:57:16 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/amarok/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31454
Modified Files:
amarok.spec
Added Files:
amarok-1.4.10-libmtp03.patch
Log Message:
* Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-4
- libmtp03 patch (unused here, but others may find it useful)
- optimize scriptlets
- enable libmp4v2 support (el5)
amarok-1.4.10-libmtp03.patch:
--- NEW FILE amarok-1.4.10-libmtp03.patch ---
--- amarok-1.4.10.orig/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
+++ amarok-1.4.10/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
@@ -298,7 +298,7 @@
debug() << "Sending track... " << bundle.url().path().utf8() << endl;
int ret = LIBMTP_Send_Track_From_File(
m_device, bundle.url().path().utf8(), trackmeta,
- progressCallback, this, parent_id
+ progressCallback, this
);
m_critical_mutex.unlock();
@@ -529,7 +529,7 @@
for( MtpMediaItem *it = dynamic_cast<MtpMediaItem*>(items->first()); it; it = dynamic_cast<MtpMediaItem*>(items->next()) )
album_object->tracks[i++] = it->track()->id();
album_object->no_tracks = items->count();
- ret = LIBMTP_Create_New_Album( m_device, album_object, 0 );
+ ret = LIBMTP_Create_New_Album( m_device, album_object );
if( ret != 0 )
{
debug() << "creating album failed : " << ret << endl;
@@ -608,7 +608,7 @@
{
debug() << "Creating new folder '" << name << "' as a child of "<< parent_id << endl;
char *name_copy = qstrdup( name );
- uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id );
+ uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id, 0 );
delete(name_copy);
debug() << "New folder ID: " << new_folder_id << endl;
if( new_folder_id == 0 )
@@ -913,7 +913,7 @@
if( item->playlist()->id() == 0 )
{
debug() << "creating new playlist : " << metadata->name << endl;
- int ret = LIBMTP_Create_New_Playlist( m_device, metadata, 0 );
+ int ret = LIBMTP_Create_New_Playlist( m_device, metadata );
if( ret == 0 )
{
item->playlist()->setId( metadata->playlist_id );
Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/EL-5/amarok.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- amarok.spec 13 Apr 2009 17:13:42 -0000 1.84
+++ amarok.spec 14 Apr 2009 13:56:45 -0000 1.85
@@ -7,8 +7,13 @@
%endif
%if 0%{?fedora} > 6
-# suffix for kde3 -devel packages
-%define kde3 3
+%define kdelibs3 kdelibs3
+%define kdebase3 kdebase3
+%else
+%define kdelibs3 kdelibs
+%define kdebase3 kdebase
+# workaround missing dep on rhel5
+BuildRequires: libutempter-devel
%endif
%if 0%{?fedora} > 6
@@ -25,13 +30,13 @@
%define _with_libmtp --with-libmtp
%define _with_libnjb --with-libnjb
%define _with_libvisual --with-libvisual
-%define _with_mp4v2 --with-mp4v2
%endif
+%define _with_mp4v2 --with-mp4v2
Name: amarok
Summary: Media player
Version: 1.4.10
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: Applications/Multimedia
License: GPLv2+
@@ -42,6 +47,8 @@
Patch1: amarok-1.4.8-gcc43.patch
# Use xdg-open to start the selected browser
Patch2: amarok-1.4.7-xdg.patch
+# Fix for newer libmtp >= 0.3
+Patch3: amarok-1.4.10-libmtp03.patch
## upstream patches
# security backport: http://websvn.kde.org/?view=rev&revision=908415
@@ -54,11 +61,9 @@
BuildRequires: esound-devel
BuildRequires: gettext
%{?_with_helix:BuildRequires: HelixPlayer}
-BuildRequires: kdelibs%{?kde3}-devel
-# workaround missing dep on rhel5
-BuildRequires: libutempter-devel
+BuildRequires: %{kdelibs3}-devel
%if 0%{?konq}
-BuildRequires: kdebase%{?kde3}-devel
+BuildRequires: %{kdebase3}-devel
%else
Obsoletes: %{name}-konqueror < %{version}-%{release}
%endif
@@ -93,8 +98,6 @@
# 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
@@ -151,6 +154,11 @@
%patch1 -p1 -b .gcc43
%patch2 -p1 -b .xdg
+
+%if 0%{?_with_libmtp:1} && "%(pkg-config --modversion libmtp)" >= "0.2.0"
+%patch3 -p1 -b .libmtp03
+%endif
+
%patch100 -p4 -b .aa_security
%patch101 -p1 -b .wikipedia
@@ -184,12 +192,6 @@
rm -fr $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-# desktop files
-desktop-file-install --vendor "" \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
- --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
-
# unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
%if ! 0%{?konq}
@@ -208,15 +210,25 @@
done
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarok.desktop
+
+
%post
/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
%postun
/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+ update-desktop-database -q &> /dev/null
+ touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%clean
@@ -232,7 +244,7 @@
%{_bindir}/amarok_proxy.rb
%{_datadir}/apps/amarok/
%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/kde/*.desktop
+%{_datadir}/applications/kde/amarok.desktop
%{_datadir}/servicetypes/*.desktop
%{_datadir}/apps/profiles/amarok.profile.xml
%{_datadir}/config/amarokrc
@@ -314,6 +326,11 @@
%changelog
+* Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-4
+- libmtp03 patch (unused here, but others may find it useful)
+- optimize scriptlets
+- enable libmp4v2 support (el5)
+
* Mon Apr 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-3
- fix wikipedia access
More information about the scm-commits
mailing list