SPECS: jflex.spec - use java_cup from java_cup package - BR: java_cup >= 0....

[pawelz]

Author: pawelz                       Date: Thu Feb 19 18:25:46 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use java_cup from java_cup package
- BR: java_cup >= 0.11a (because of ant task)
- added Patch0 (use anttask from java_cup package)
- added Patch1 (do not set target="1.1")
- use java-gcj-compat-devel
- NFY (does not build)

---- Files affected:
SPECS:
   jflex.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/jflex.spec
diff -u SPECS/jflex.spec:1.9 SPECS/jflex.spec:1.10
--- SPECS/jflex.spec:1.9	Sun Dec  2 17:14:39 2007
+++ SPECS/jflex.spec	Thu Feb 19 19:25:41 2009
@@ -14,9 +14,11 @@
 # Source0-md5:	9e4be6e826e6b344e84c0434d6fd4b46
 Source1:	http://jflex.sourceforge.net/jar/stable/JFlex-%{version}.jar
 # Source1-md5:	626c0c66135a48c042d3b35af95d274d
-Source2:	http://jflex.sourceforge.net/jar/stable/java_cup_10k-lsf.jar
-# Source2-md5:	26aef43b31cf3e0b581017e75a325b7b
+Patch0:		%{name}-anttask.patch
+Patch1:		%{name}-notarget.patch
 URL:		http://jflex.de/
+BuildRequires:	java_cup >= 0.11a
+BuildRequires:	java-gcj-compat-devel
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -67,13 +69,19 @@
 %prep
 # use -c because of top-level symlink
 %setup -qc
+
+%patch0 -p1
+%patch1 -p1
+
 install -d jflex/tools
 ln -s %{SOURCE1} jflex/tools/JFlex.jar
-ln -s %{SOURCE2} jflex/tools/java_cup.jar
 
 %build
 export LC_ALL=en_US # source code not US-ASCII
-%ant -f jflex/src/build.xml \
+JAVACUPJAR=$(find-jar java_cup)
+cd jflex/src
+%ant -Dbuild.compiler=extJavac \
+	-Dcup.jar=$JAVACUPJAR \
 	realclean jar
 
 %install
@@ -102,6 +110,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2009/02/19 18:25:41  pawelz
+- use java_cup from java_cup package
+- BR: java_cup >= 0.11a (because of ant task)
+- added Patch0 (use anttask from java_cup package)
+- added Patch1 (do not set target="1.1")
+- use java-gcj-compat-devel
+- NFY (does not build)
+
 Revision 1.9  2007/12/02 16:14:39  glen
 - make it build without network
 - cleanups
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jflex.spec?r1=1.9&r2=1.10&f=u