packages (AMAROK_1_4): amarok/amarok.spec, amarok/kde-am.patch (NEW) - add ...

[glen]

Author: glen                         Date: Tue Aug 25 08:50:49 2009 GMT
Module: packages                      Tag: AMAROK_1_4
---- Log message:
- add automake 1.11 patch

---- Files affected:
packages/amarok:
   amarok.spec (1.200.2.1 -> 1.200.2.2) , kde-am.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/amarok/amarok.spec
diff -u packages/amarok/amarok.spec:1.200.2.1 packages/amarok/amarok.spec:1.200.2.2
--- packages/amarok/amarok.spec:1.200.2.1	Wed Jun 17 16:21:53 2009
+++ packages/amarok/amarok.spec	Tue Aug 25 10:50:43 2009
@@ -43,6 +43,7 @@
 Patch7:		%{name}-titleorder.patch
 Patch8:		%{name}-mongrel.patch
 Patch9:		%{name}-libmtp.patch
+Patch10:	kde-am.patch
 URL:		http://amarok.kde.org/
 # Upgrade to 2.0.1.1 required?
 # http://www.trapkit.de/advisories/TKADV2009-002.txt
@@ -205,6 +206,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p0
+%patch10 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \
 	amarok/src/amarok.desktop \
@@ -451,6 +453,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.200.2.2  2009/08/25 08:50:43  glen
+- add automake 1.11 patch
+
 Revision 1.200.2.1  2009/06/17 14:21:53  hawk
 - release 10
 

================================================================
Index: packages/amarok/kde-am.patch
diff -u /dev/null packages/amarok/kde-am.patch:1.1.2.1
--- /dev/null	Tue Aug 25 10:50:49 2009
+++ packages/amarok/kde-am.patch	Tue Aug 25 10:50:44 2009
@@ -0,0 +1,11 @@
+--- kdelibs-3.5.10/admin/cvs.sh~	2008-08-19 23:28:39.000000000 +0300
++++ kdelibs-3.5.10/admin/cvs.sh	2009-05-19 13:34:47.966210297 +0300
+@@ -68,7 +68,7 @@
+     echo "*** KDE requires automake $required_automake_version"
+     exit 1
+     ;;
+-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*)
+     echo "*** $AUTOMAKE_STRING found."
+     UNSERMAKE=no
+     ;;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amarok/amarok.spec?r1=1.200.2.1&r2=1.200.2.2&f=u