packages: kdebase/kde-am.patch, kdebase/kdebase.spec - automake 1.11 from k...

[glen]

Author: glen                         Date: Wed May 20 07:14:49 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- automake 1.11 from kdelibs

---- Files affected:
packages/kdebase:
   kde-am.patch (1.1 -> 1.2) , kdebase.spec (1.623 -> 1.624) 

---- Diffs:

================================================================
Index: packages/kdebase/kde-am.patch
diff -u packages/kdebase/kde-am.patch:1.1 packages/kdebase/kde-am.patch:1.2
--- packages/kdebase/kde-am.patch:1.1	Fri Oct 27 10:00:00 2006
+++ packages/kdebase/kde-am.patch	Wed May 20 09:14:44 2009
@@ -1,11 +1,11 @@
---- kde/admin/cvs.sh.org	2006-10-27 07:59:00.057543638 +0000
-+++ kde/admin/cvs.sh	2006-10-27 07:59:38.666892277 +0000
+--- 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.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.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*)
      echo "*** $AUTOMAKE_STRING found."
      UNSERMAKE=no
      ;;

================================================================
Index: packages/kdebase/kdebase.spec
diff -u packages/kdebase/kdebase.spec:1.623 packages/kdebase/kdebase.spec:1.624
--- packages/kdebase/kdebase.spec:1.623	Thu Apr 23 12:35:22 2009
+++ packages/kdebase/kdebase.spec	Wed May 20 09:14:44 2009
@@ -75,6 +75,7 @@
 Patch26:	%{name}-kdm-default_background.patch
 Patch27:	%{name}-consolekit.patch
 Patch28:	%{name}-no_mkfontdir.patch
+Patch29:	kde-am.patch
 BuildRequires:	OpenEXR-devel >= 1.4.0.a
 BuildRequires:	OpenGL-devel
 BuildRequires:	audiofile-devel
@@ -1099,6 +1100,7 @@
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
 
 cd kcontrol/ebrowsing/plugins/ikws/searchproviders
 for i in  google*.desktop
@@ -2644,6 +2646,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.624  2009/05/20 07:14:44  glen
+- automake 1.11 from kdelibs
+
 Revision 1.623  2009/04/23 10:35:22  glen
 - add branch.diff
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdebase/kde-am.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdebase/kdebase.spec?r1=1.623&r2=1.624&f=u