Author: glen Date: Wed May 20 12:19:17 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- am 1.11 patch
---- Files affected:
packages/kdepim:
kde-am.patch (1.1 -> 1.2) , kdepim.spec (1.296 -> 1.297)
---- Diffs:
================================================================
Index: packages/kdepim/kde-am.patch
diff -u packages/kdepim/kde-am.patch:1.1 packages/kdepim/kde-am.patch:1.2
--- packages/kdepim/kde-am.patch:1.1 Fri Oct 27 10:00:00 2006
+++ packages/kdepim/kde-am.patch Wed May 20 14:19:12 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/kdepim/kdepim.spec
diff -u packages/kdepim/kdepim.spec:1.296 packages/kdepim/kdepim.spec:1.297
--- packages/kdepim/kdepim.spec:1.296 Thu Apr 23 12:35:22 2009
+++ packages/kdepim/kdepim.spec Wed May 20 14:19:12 2009
@@ -34,6 +34,7 @@
Patch7: %{name}-kmail-templatesconfiguration.patch
Patch8: %{name}-sparc64.patch
Patch9: %{name}-inotify.patch
+Patch10: kde-am.patch
BuildRequires: autoconf
BuildRequires: autoconf
BuildRequires: automake
@@ -512,6 +513,7 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;Calendar;/' \
korganizer/korganizer.desktop
@@ -1232,6 +1234,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.297 2009/05/20 12:19:12 glen
+- am 1.11 patch
+
Revision 1.296 2009/04/23 10:35:22 glen
- add branch.diff
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdepim/kde-am.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdepim/kdepim.spec?r1=1.296&r2=1.297&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
