classpath: make disable-automake-checks apply to CVS version of classpath-gtk

diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb
index 111f1bf..53f494a 100644 (file)
--- a/packages/classpath/classpath-gtk_cvs.bb
+++ b/packages/classpath/classpath-gtk_cvs.bb
@@ -3,6 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/classpath/"
 LICENSE = "Classpath"
 PRIORITY = "optional"
 SECTION = "libs"
+PR = "r1"
 
 SRCDATE_${PN} ?= "20070501"
 PV = "0.93+cvs${SRCDATE}"
@@ -12,7 +13,7 @@ RDEPENDS_${PN} = "classpath-common (>= ${PV})"
 RCONFLICTS_${PN} = "classpath-minimal"
 
 SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/sources/classpath;module=classpath \
-           file://disable-automake-checks.patch;patch=1"
+           file://disable-automake-checks-v2.patch;patch=1"
 
 S = "${WORKDIR}/classpath"
 

diff --git a/packages/classpath/files/disable-automake-checks-v2.patch b/packages/classpath/files/disable-automake-checks-v2.patch
new file mode 100644 (file)
index 0000000..0c1df1a
--- /dev/null
+++ b/packages/classpath/files/disable-automake-checks-v2.patch
@@ -0,0 +1,11 @@
+--- sablevm-classpath-1.1.7/configure.ac.orig  2004-11-26 00:23:01.000000000 +0100
++++ sablevm-classpath-1.1.7/configure.ac       2004-11-26 00:23:46.000000000 +0100
+@@ -34,7 +34,7 @@
+ AC_SUBST(CLASSPATH_MODULE)
+ 
+ AC_PREREQ(2.59)
+-AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability])
++AM_INIT_AUTOMAKE
+ AC_CONFIG_HEADERS([include/config.h])
+ AC_PREFIX_DEFAULT(/usr/local)
+