packages: koffice/koffice.spec, koffice/kde-am.patch (NEW) - add automake 1...

[glen]

Author: glen                         Date: Mon Aug 24 22:22:18 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add automake 1.11 patch

---- Files affected:
packages/koffice:
   koffice.spec (1.202 -> 1.203) , kde-am.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/koffice/koffice.spec
diff -u packages/koffice/koffice.spec:1.202 packages/koffice/koffice.spec:1.203
--- packages/koffice/koffice.spec:1.202	Tue Jun 16 20:00:27 2009
+++ packages/koffice/koffice.spec	Tue Aug 25 00:22:12 2009
@@ -28,6 +28,7 @@
 Patch3:		kde-ac260-lt.patch
 Patch4:		%{name}-gcc.patch
 Patch5:		%{name}-gmagick.patch
+Patch6:		kde-am.patch
 URL:		http://www.koffice.org/
 BuildRequires:	GraphicsMagick-devel >= 1.1.7
 BuildRequires:	ImageMagick-c++-devel >= 1:6.2.4.0
@@ -401,6 +402,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__sed} -i 's/Categories=Qt;KDE;Office/Categories=Qt;KDE;Office;X-Misc;/' \
 	tools/kthesaurus/KThesaurus.desktop
@@ -1038,6 +1040,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.203  2009/08/24 22:22:12  glen
+- add automake 1.11 patch
+
 Revision 1.202  2009/06/16 18:00:27  charles
 - BR: libpaper-devel
 

================================================================
Index: packages/koffice/kde-am.patch
diff -u /dev/null packages/koffice/kde-am.patch:1.1
--- /dev/null	Tue Aug 25 00:22:18 2009
+++ packages/koffice/kde-am.patch	Tue Aug 25 00:22:12 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/koffice/koffice.spec?r1=1.202&r2=1.203&f=u