packages: kdelibs/kde-am.patch, kdelibs/kdelibs.spec - adjust for automake ...

glen glen at pld-linux.org
Tue May 19 12:38:25 CEST 2009


Author: glen                         Date: Tue May 19 10:38:25 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjust for automake 1.11

---- Files affected:
packages/kdelibs:
   kde-am.patch (1.1 -> 1.2) , kdelibs.spec (1.577 -> 1.578) 

---- Diffs:

================================================================
Index: packages/kdelibs/kde-am.patch
diff -u packages/kdelibs/kde-am.patch:1.1 packages/kdelibs/kde-am.patch:1.2
--- packages/kdelibs/kde-am.patch:1.1	Fri Oct 27 10:00:00 2006
+++ packages/kdelibs/kde-am.patch	Tue May 19 12:38:18 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/kdelibs/kdelibs.spec
diff -u packages/kdelibs/kdelibs.spec:1.577 packages/kdelibs/kdelibs.spec:1.578
--- packages/kdelibs/kdelibs.spec:1.577	Thu Apr 23 12:35:22 2009
+++ packages/kdelibs/kdelibs.spec	Tue May 19 12:38:18 2009
@@ -19,7 +19,7 @@
 Summary(uk.UTF-8):	K Desktop Environment - Бібліотеки
 Name:		kdelibs
 Version:	3.5.10
-Release:	10
+Release:	11
 Epoch:		9
 License:	LGPL
 Group:		X11/Libraries
@@ -47,6 +47,7 @@
 Patch10:	%{name}-kate-syntax.patch
 Patch11:	%{name}-konqueror-ti-agent.patch
 Patch12:	%{name}-konqueror-agent.patch
+Patch13:	kde-am.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenEXR-devel >= 1.4.0.a
 BuildRequires:	acl-devel
@@ -370,6 +371,7 @@
 %else
 %patch12 -p1
 %endif
+%patch13 -p1
 
 mv -f configure{,.dist}
 
@@ -994,6 +996,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.578  2009/05/19 10:38:18  glen
+- adjust for automake 1.11
+
 Revision 1.577  2009/04/23 10:35:22  glen
 - add branch.diff
 
================================================================

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



More information about the pld-cvs-commit mailing list