From 45869fdc185167a0397cece6278b901b6bffc316 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtakov@fedoraproject.org>
Date: Jan 20 2010 11:35:55 +0000
Subject: - Provide JFlex.jar.

- Don't put java_cup classes in the jar.
- Add maven pom and depmaps.
- Update to 1.4.3.

---

diff --git a/.cvsignore b/.cvsignore
index ef23acf..2111dc5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 jflex-1.4.1.tar.gz
+jflex-1.4.3.tar.gz
diff --git a/jflex-1.4.3.pom b/jflex-1.4.3.pom
new file mode 100644
index 0000000..b5d93d9
--- /dev/null
+++ b/jflex-1.4.3.pom
@@ -0,0 +1,57 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>de.jflex</groupId>
+  <artifactId>jflex</artifactId>
+  <packaging>jar</packaging>
+  <version>1.4.3</version>
+  <!-- this is a pseudo POM, to be uploaded manually -->
+  <dependencies />
+  
+  <name>JFlex - The Fast Scanner Generator for Java</name>
+  <description>JFlex is a lexical analyzer generator (also known as scanner generator) for Java(tm), written in Java(tm). 
+  JFlex is designed to work together with the LALR parser generator CUP by Scott Hudson, and the Java modification of Berkeley Yacc BYacc/J by Bob Jamison. It can also be used together with other parser generators like ANTLR or as a standalone tool. </description>
+  <url>http://jflex.de/</url>
+  <inceptionYear>1998</inceptionYear>
+  <licenses>
+   <license>
+     <name>GNU General Public License</name>
+     <url>http://jflex.de/copying.html#GPL</url>
+     <distribution>repo</distribution>
+     <comments>The code generated by JFlex inherits the copyright of the specification it was produced from. If it was your specification, you may use the generated code without restriction. </comments>
+   </license>
+  </licenses>
+  <scm>
+    <connection>scm:svn:http://jflex.svn.sourceforge.net/svnroot/jflex</connection>
+    <developerConnection>scm:svn:https://jflex.svn.sourceforge.net/svnroot/jflex</developerConnection>
+    <url>http://jflex.svn.sourceforge.net/viewvc/jflex/</url>
+  </scm>
+  <developers>
+   <developer>
+      <id>gerwin</id>
+      <name>Gerwin Klein</name>
+      <email>lsf@jflex.de</email>
+      <roles>
+        <role>architect</role>
+        <role>developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <issueManagement>
+    <system>SF tracker</system>
+    <url>http://sourceforge.net/tracker/?group_id=14929</url>
+  </issueManagement>
+  <mailingLists>
+    <mailingList>
+      <name>jflex-announce</name>
+      <subscribe>http://lists.sourceforge.net/lists/listinfo/jflex-announce</subscribe>
+      <unsubscribe>http://lists.sourceforge.net/lists/listinfo/jflex-announce</unsubscribe>
+      <archive>http://sourceforge.net/mailarchive/forum.php?forum=jflex-announce</archive>
+    </mailingList>
+    <mailingList>
+      <name>jflex-users</name>
+      <subscribe>http://lists.sourceforge.net/lists/listinfo/jflex-users</subscribe>
+      <unsubscribe>http://lists.sourceforge.net/lists/listinfo/jflex-users</unsubscribe>
+      <archive>http://sourceforge.net/mailarchive/forum.php?forum=jflex-users</archive>
+    </mailingList>
+  </mailingLists>
+</project>
diff --git a/jflex-build_xml.patch b/jflex-build_xml.patch
index c8e8cd5..f1f5b46 100644
--- a/jflex-build_xml.patch
+++ b/jflex-build_xml.patch
@@ -1,22 +1,21 @@
---- 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">
-     <javac srcdir="." 
-            destdir="../lib" 
--           target="1.1"
-+           classpath="."
-+           debug="on" />
-+  </target>
-+ 
-+  <target name="compile-bootstrap"
-+          description="compile all classes during a bootstrap">
-+    <javac srcdir="." 
-+           destdir="../lib" 
-            classpath="."
+--- src/build.xml.sav	2008-05-28 11:45:28.000000000 +0300
++++ src/build.xml	2010-01-08 12:22:48.820864187 +0200
+@@ -69,6 +69,14 @@
+            classpath=".:${junit.jar}"
             debug="on" />
    </target>
-@@ -83,6 +90,14 @@
++	
++  <target name="compile-bootstrap"
++	          description="compile all classes during a bootstrap">
++	<javac srcdir="." 
++	       destdir="../lib" 
++	       classpath="."
++	       debug="on" />
++  </target>
+ 
+   <target name="jflex" depends="declare" description="generate scanner">
+     <jflex file="JFlex/LexScan.flex" skeleton="skeleton.nested"/>
+@@ -89,6 +97,14 @@
      	 jarfile="../lib/JFlex.jar" 
      	 manifest="manifest"/>
    </target>
diff --git a/jflex.spec b/jflex.spec
index 3cca6a4..2eb2a6a 100644
--- a/jflex.spec
+++ b/jflex.spec
@@ -32,13 +32,14 @@
 
 Summary:        Fast Scanner Generator
 Name:           jflex
-Version:        1.4.1
-Release:        0.5%{?dist}
+Version:        1.4.3
+Release:        1%{?dist}
 Epoch:          0
 License:        GPLv2
 URL:            http://jflex.de/
 Group:          Development/Libraries
 Source0:        http://jflex.de/%{name}-%{version}.tar.gz
+Source1:        http://repo2.maven.org/maven2/de/jflex/jflex/1.4.3/jflex-1.4.3.pom
 Patch0:         jflex-build_xml.patch
 BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:  ant
@@ -75,6 +76,7 @@ for j in $(find . -name "*.jar"); do mv $j $j.no; done
 find . -name "*.class" -exec rm {} \;
 
 %{__sed} -i 's/\r//' COPYRIGHT
+%{__sed} -i 's|includes="JFlex/\*\*,java_cup/\*\*,skeleton|includes="JFlex/\*\*,skeleton|g' src/build.xml 
 
 %build
 
@@ -98,6 +100,14 @@ cp -p lib/JFlex.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; \
    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+(cd $RPM_BUILD_ROOT%{_javadir} && ln -sf jflex.jar JFlex.jar)
+   
+%add_to_maven_depmap de.jflex jflex %{version} JPP jflex
+
+# poms
+install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
+install -pm 644 %{SOURCE1} \
+    %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
 
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -112,19 +122,32 @@ cp -p COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
 %files
 %defattr(0644,root,root,0755)
 %doc %{_docdir}/%{name}-%{version}
 %{_javadir}/*.jar
+%{_datadir}/maven2/poms/*
+%{_mavendepmapfragdir}/*
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
-# -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jan 20 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.4.3-1
+- Provide JFlex.jar.
+- Don't put java_cup classes in the jar.
+- Add maven pom and depmaps.
+- Update to 1.4.3.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4.1-0.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index f695fb1..ceacbb3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e4be6e826e6b344e84c0434d6fd4b46  jflex-1.4.1.tar.gz
+27a30015859957d8af30bc336d40bc30  jflex-1.4.3.tar.gz