rpms/kdeedu/devel kdeedu-3.5.4-automakeversion.patch, NONE, 1.1 kdeedu.spec, 1.52, 1.53

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Dec 14 12:25:05 UTC 2006


Author: karsten

Update of /cvs/dist/rpms/kdeedu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18479

Modified Files:
	kdeedu.spec 
Added Files:
	kdeedu-3.5.4-automakeversion.patch 
Log Message:
- - fix automake version check

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

--- NEW FILE kdeedu-3.5.4-automakeversion.patch ---
--- kdeedu-3.5.4/admin/cvs.sh.automakeversion	2006-12-14 12:46:00.000000000 +0100
+++ kdeedu-3.5.4/admin/cvs.sh	2006-12-14 12:46:15.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: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kdeedu.spec	10 Aug 2006 12:36:16 -0000	1.52
+++ kdeedu.spec	14 Dec 2006 12:25:03 -0000	1.53
@@ -11,7 +11,7 @@
 
 Name: kdeedu
 Version: 3.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Educational/Edutainment applications for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -20,6 +20,7 @@
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Patch1: kde-libtool.patch
+Patch2: kdeedu-3.5.4-automakeversion.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: qt >= %{qt_epoch}:%{qt_version}
@@ -64,6 +65,7 @@
 
 %prep
 %setup -q
+%patch2 -p1 -b .autmakeversion
 
 %ifarch s390 s390x ppc ppc64
   rm -rf doc/kstars kstars
@@ -147,6 +149,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Thu Dec 14 2006 Karsten Hopp <karsten at redhat.com> 3.5.4-2
+- fix automake version check
+
 * Thu Aug 10 2006 Than Ngo <than at redhat.com> 3.5.4-1
 - rebuild
 




More information about the fedora-cvs-commits mailing list