diff --git a/jflex-build_xml.patch b/jflex-build_xml.patch
new file mode 100644
index 0000000..c8e8cd5
--- /dev/null
+++ b/jflex-build_xml.patch
@@ -0,0 +1,33 @@
+--- src/build.xml.orig 2004-05-19 19:37:43.000000000 -0400
++++ src/build.xml 2008-02-22 14:04:46.000000000 -0500
+@@ -59,7 +59,14 @@
+ description="compile all classes">
+
++
++
++
++
+
+@@ -83,6 +90,14 @@
+ jarfile="../lib/JFlex.jar"
+ manifest="manifest"/>
+
++
++
++
++
++
+
+
+
diff --git a/jflex.spec b/jflex.spec
index ff89b0a..247237b 100644
--- a/jflex.spec
+++ b/jflex.spec
@@ -32,18 +32,17 @@
Summary: Fast Scanner Generator
Name: jflex
-Version: 1.3.5
-Release: 2jpp.2%{?dist}
+Version: 1.4.1
+Release: 0jpp.1%{?dist}
Epoch: 0
-License: GPL
+License: GPLv2
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
+Group: Development/Libraries
+Source0: http://jflex.de/%{name}-%{version}.tar.gz
+Patch0: jflex-build_xml.patch
BuildRequires: jpackage-utils >= 0:1.5
-BuildRequires: make
+BuildRequires: ant
+BuildRequires: junit
BuildRequires: java-devel
Requires: java
BuildArch: noarch
@@ -63,24 +62,30 @@ standalone tool.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Documentation
+Group: Documentation
%description javadoc
%{summary}.
%prep
-%setup -q -n JFlex
+%setup -q
+%patch0 -b .sav
for j in $(find . -name "*.jar"); do mv $j $j.no; done
find . -name "*.class" -exec rm {} \;
%{__sed} -i 's/\r//' COPYRIGHT
-%patch0 -b .sav
-%patch1 -b .sav
-%patch2 -b .sav
+
%build
pushd src
-make all javadoc
+# intial build using the autogenerated sym.java LexParse.java and LexScan.java
+# these are created by the jflex ant task which needs to be built first
+CLASSPATH=%{_javadir}/junit.jar:%{_javadir}/java_cup.jar ant jar-bootstrap
+# now that the JFlex.jar has been build we can use jflex ant tasks
+# removing the generated files and rebuilding using the JFlex.jar
+CLASSPATH=%{_javadir}/junit.jar:%{_javadir}/java_cup.jar:../lib/JFlex.jar ant genclean libclean jar
+
+javadoc -sourcepath . -d ../api JFlex
popd
%install
@@ -119,6 +124,12 @@ rm -rf $RPM_BUILD_ROOT
# -----------------------------------------------------------------------------
%changelog
+* Fri Feb 22 2008 Matt Wringe - 0:1.4.1-0jpp.1
+- Patch build file to allow bootstrap building
+
+* Mon Feb 18 2008 Lubomir Kundrak - 0:1.4.1-0jpp.1
+- Naive attempt to update to newer version
+
* Mon Apr 02 2007 Matt Wringe - 0:1.3.5-2jpp.2
- Add patches jflex-CharSet_java.patch and jflex-StateSet_java.patch
to allow building with the new gcj