rpms/jflex/devel jflex-CharSet_java.patch, NONE, 1.1 jflex-StateSet_java.patch, NONE, 1.1 jflex.spec, 1.1, 1.2

[Matt Wringe (mwringe)]

Author: mwringe

Update of /cvs/extras/rpms/jflex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20410

Modified Files:
	jflex.spec 
Added Files:
	jflex-CharSet_java.patch jflex-StateSet_java.patch 
Log Message:
Add patches jflex-CharSet_java.patch and jflex-StateSet_java.patch
to allow building with the new gcj


jflex-CharSet_java.patch:

--- NEW FILE jflex-CharSet_java.patch ---
--- ./src/JFlex/CharSet.java.orig	2007-04-02 11:03:11.000000000 -0400
+++ ./src/JFlex/CharSet.java	2007-04-02 11:03:47.000000000 -0400
@@ -94,14 +94,14 @@
   }
   
   public String toString() {
-    CharSetEnumerator enum = characters();
+    CharSetEnumerator enumer = characters();
 
     StringBuffer result = new StringBuffer("{");
 
-    if ( enum.hasMoreElements() ) result.append(""+enum.nextElement());
+    if ( enumer.hasMoreElements() ) result.append(""+enumer.nextElement());
 
-    while ( enum.hasMoreElements() ) {
-      int i = enum.nextElement();
+    while ( enumer.hasMoreElements() ) {
+      int i = enumer.nextElement();
       result.append( ", "+(int)i);
     }
 

jflex-StateSet_java.patch:

--- NEW FILE jflex-StateSet_java.patch ---
--- ./src/JFlex/StateSet.java.orig	2007-04-02 11:04:11.000000000 -0400
+++ ./src/JFlex/StateSet.java	2007-04-02 11:04:38.000000000 -0400
@@ -276,14 +276,14 @@
 
   
   public String toString() {
-    StateSetEnumerator enum = states();
+    StateSetEnumerator enumer = states();
 
     StringBuffer result = new StringBuffer("{");
 
-    if ( enum.hasMoreElements() ) result.append(""+enum.nextElement());
+    if ( enumer.hasMoreElements() ) result.append(""+enumer.nextElement());
 
-    while ( enum.hasMoreElements() ) {
-      int i = enum.nextElement();
+    while ( enumer.hasMoreElements() ) {
+      int i = enumer.nextElement();
       result.append( ", "+i);
     }
 


Index: jflex.spec
===================================================================
RCS file: /cvs/extras/rpms/jflex/devel/jflex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jflex.spec	6 Mar 2007 21:40:14 -0000	1.1
+++ jflex.spec	2 Apr 2007 20:02:58 -0000	1.2
@@ -33,13 +33,15 @@
 Summary:        Fast Scanner Generator
 Name:           jflex
 Version:        1.3.5
-Release:        2jpp.1%{?dist}
+Release:        2jpp.2%{?dist}
 Epoch:          0
 License:        GPL
 URL:            http://jflex.de/
 Group:          Development/Libraries/Java
 Source0:        http://downloads.sourceforge.net/jflex/jflex-1.3.5.tar.gz
 Patch0:         jflex-Makefile.patch
+Patch1:         jflex-CharSet_java.patch
+Patch2:         jflex-StateSet_java.patch
 BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:  make
 BuildRequires:  java-devel
@@ -73,7 +75,8 @@
 
 %{__sed} -i 's/\r//' COPYRIGHT
 %patch0 -b .sav
-
+%patch1 -b .sav
+%patch2 -b .sav
 %build
 
 pushd src
@@ -116,6 +119,10 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Apr 02 2007 Matt Wringe <mwringe at redhat.com> - 0:1.3.5-2jpp.2
+- Add patches jflex-CharSet_java.patch and jflex-StateSet_java.patch
+  to allow building with the new gcj
+
 * Mon Feb 12 2007 Matt Wringe <mwringe at redhat.com> - 0:1.3.5-2jpp.1
 - Remove javadoc post and postun sections due to new jpp standard 
 - Update makefile patch to compress jar