SPECS: amarok.spec - titleorder.patch restored

glen glen at pld-linux.org
Wed Dec 27 10:54:11 CET 2006


Author: glen                         Date: Wed Dec 27 09:54:11 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- titleorder.patch restored

---- Files affected:
SPECS:
   amarok.spec (1.152 -> 1.153) 

---- Diffs:

================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.152 SPECS/amarok.spec:1.153
--- SPECS/amarok.spec:1.152	Wed Dec 27 10:53:08 2006
+++ SPECS/amarok.spec	Wed Dec 27 10:54:06 2006
@@ -42,6 +42,7 @@
 Patch4:		kde-ac260-lt.patch
 Patch5:		kde-common-PLD.patch
 Patch6:		%{name}-gcc4.patch
+Patch7:		%{name}-titleorder.patch
 URL:		http://amarok.kde.org/
 BuildRequires:	SDL-devel
 BuildRequires:	alsa-lib-devel
@@ -55,9 +56,9 @@
 BuildRequires:	kdemultimedia-devel >= 9:3.1.93
 %{?with_mp3players:BuildRequires:	libgpod-devel >= 0.2.0}
 %{?with_mp3players:BuildRequires:	libifp-devel}
+BuildRequires:	libltdl-devel
 %{?with_mp3players:BuildRequires:	libmtp-devel}
 %{?with_mp3players:BuildRequires:	libnjb-devel}
-BuildRequires:	libltdl-devel
 %{?with_pgsql:BuildRequires:		libpqxx-devel}
 BuildRequires:	libtunepimp-devel >= 0.5.1-6
 BuildRequires:	libvisual-devel >= 0.4.0
@@ -214,6 +215,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \
 	amarok/src/amarok.desktop \
@@ -224,7 +226,7 @@
 # kill env, call interpreter directly, so rpm automatics could rule
 %{__sed} -i -e '
 	1s,#!.*bin/env.*ruby,#!%{_bindir}/ruby,
-	1s,#!.*bin/env.*python,#!%{_bindir}/python,
+	1s,#!.*bin/env.*python,#!%{__python},
 	1s,#!.*bin/env.*bash,#!/bin/bash,
 ' amarok/src/scripts/*/*.{py,rb,sh} amarok/src/amarok_proxy.rb
 
@@ -481,6 +483,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.153  2006/12/27 09:54:06  glen
+- titleorder.patch restored
+
 Revision 1.152  2006/12/27 09:53:08  glen
 - drop .la once more
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/amarok.spec?r1=1.152&r2=1.153&f=u



More information about the pld-cvs-commit mailing list