rpms/kdepim/devel kdepim-3.5.5-automakeversion.patch, NONE, 1.1 kdepim.spec, 1.114, 1.115

[fedora-cvs-commits at redhat.com]

Author: karsten

Update of /cvs/dist/rpms/kdepim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18410

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-3.5.5-automakeversion.patch 
Log Message:
- fix automake version check

kdepim-3.5.5-automakeversion.patch:
 cvs.sh |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdepim-3.5.5-automakeversion.patch ---
--- kdepim-3.5.5/admin/cvs.sh.amversion	2006-11-29 15:43:55.000000000 +0100
+++ kdepim-3.5.5/admin/cvs.sh	2006-11-29 15:44:20.000000000 +0100
@@ -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*)
     echo "*** $AUTOMAKE_STRING found."
     UNSERMAKE=no
     ;;


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- kdepim.spec	29 Nov 2006 14:30:22 -0000	1.114
+++ kdepim.spec	29 Nov 2006 14:46:21 -0000	1.115
@@ -10,7 +10,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.5
-Release: 1.1%{?dist}
+Release: 1%{?dist}
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
@@ -27,6 +27,7 @@
 Patch2: kdepim-3.4.0-s390.patch
 Patch3: kdepim-3.4.0-kandy-icons.patch
 Patch4: kdepim-3.4.92-libz.patch
+Patch5: kdepim-3.5.5-automakeversion.patch
 
 # upstream patches
 Patch100: kdepim-3.5.5-kde#135513.patch
@@ -80,6 +81,7 @@
 
 %patch3 -p1 -b .kandy-icons
 %patch4 -p1 -b .libz
+%patch5 -p1 -b .amversion
 
 # upstream patches
 %patch100 -p0 -b .kde#135513
@@ -196,6 +198,7 @@
 %changelog
 * Wed Nov 29 2006 Karsten Hopp <karsten at redhat.com> 3.5.5-1.fc7
 - rebuild with new pilot-link libs
+- fix automake version check
 
 * Fri Nov 10 2006 Than Ngo <than at redhat.com> 6:3.5.5-0.2.fc6
 - apply upstream patch to fix bz#215081 (kde#135513)