packages: kdeaddons/kdeaddons.spec, kdeaddons/kde-am.patch - re-add kde-am....

[glen]

Author: glen                         Date: Sun Mar 14 21:48:50 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- re-add kde-am.patch

---- Files affected:
packages/kdeaddons:
   kdeaddons.spec (1.151 -> 1.152) , kde-am.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/kdeaddons/kdeaddons.spec
diff -u packages/kdeaddons/kdeaddons.spec:1.151 packages/kdeaddons/kdeaddons.spec:1.152
--- packages/kdeaddons/kdeaddons.spec:1.151	Sun Mar 14 22:00:55 2010
+++ packages/kdeaddons/kdeaddons.spec	Sun Mar 14 22:48:45 2010
@@ -32,6 +32,7 @@
 Patch0:		kde-common-PLD.patch
 Patch1:		kde-ac260-lt.patch
 Patch2:		%{name}-babelfish-google.patch
+Patch3:		kde-am.patch
 URL:		http://www.kde.org/
 BuildRequires:	SDL-devel
 BuildRequires:	autoconf
@@ -263,6 +264,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %{__sed} -i -e '/\[Desktop Entry\]/aEncoding=UTF-8' \
 	-e 's/Terminal=0/Terminal=false/' \
@@ -583,6 +585,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.152  2010/03/14 21:48:45  glen
+- re-add kde-am.patch
+
 Revision 1.151  2010/03/14 21:00:55  glen
 - move dirfilterplugin.desktop to services from applnk; rel 5
 

================================================================
Index: packages/kdeaddons/kde-am.patch
diff -u /dev/null packages/kdeaddons/kde-am.patch:1.3
--- /dev/null	Sun Mar 14 22:48:50 2010
+++ packages/kdeaddons/kde-am.patch	Sun Mar 14 22:48:45 2010
@@ -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/kdeaddons/kdeaddons.spec?r1=1.151&r2=1.152&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdeaddons/kde-am.patch?r1=1.2&r2=1.3&f=u