.gitignore

@@ -1 +1 @@
-SOURCES/qdox-2.0-M9.tar.gz
+SOURCES/qdox-2.0~M10.tar.gz

.qdox.metadata

@@ -1 +1 @@
-02bd145fb63f5252992f40ce79123991d8379598 SOURCES/qdox-2.0-M9.tar.gz
+23152becb77e6cbae4f4587bb557af3441f6734f SOURCES/qdox-2.0~M10.tar.gz

SOURCES/0001-Port-to-JFlex-1.7.0.patch

@@ -0,0 +1,39 @@
+From 31f530b26bd4625ffe41aa16c48836455ef81c23 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Fri, 7 Jun 2019 10:39:34 +0200
+Subject: [PATCH] Port to JFlex 1.7.0
+
+---
+ src/grammar/lexer.flex                                          | 2 +-
+ .../java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/grammar/lexer.flex b/src/grammar/lexer.flex
+index 9b567ff..cd9d5b6 100644
+--- a/src/grammar/lexer.flex
++++ b/src/grammar/lexer.flex
+@@ -168,7 +168,7 @@ import java.util.*;
+   	}
+ 
+     public JFlexLexer( java.io.InputStream stream, java.io.Writer writer ) {
+-       this( stream );
++       this( new java.io.InputStreamReader( stream, java.nio.charset.Charset.forName( "UTF-8" ) ) );
+        this.writer = writer;
+   	}
+ 
+diff --git a/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java b/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java
+index c947f9b..5b415c0 100644
+--- a/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java
++++ b/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java
+@@ -112,7 +112,7 @@ public class ClassLoaderLibrary
+             if ( sourceStream != null )
+             {
+                 Builder builder = getModelBuilder();
+-                JavaLexer lexer = new JFlexLexer( sourceStream );
++                JavaLexer lexer = new JFlexLexer( new java.io.InputStreamReader( sourceStream, java.nio.charset.Charset.forName( "UTF-8" ) ) );
+                 Parser parser = new Parser( lexer, builder );
+                 parser.setDebugLexer( debugLexer );
+                 parser.setDebugParser( debugParser );
+-- 
+2.21.0
+

SOURCES/generate-tarball.sh

@@ -3,15 +3,14 @@ set -e
 
 name=qdox
 version="$(sed -n 's/Version:\s*//p' *.spec)"
-vertag="$(sed -n 's/%global\s*vertag\s*//p' *.spec)"
 
 # RETRIEVE
-wget "http://repo2.maven.org/maven2/com/thoughtworks/qdox/qdox/${version}-${vertag}/${name}-${version}-${vertag}-project.tar.gz" -O "${name}-${version}-${vertag}.orig.tar.gz"
+wget "http://repo2.maven.org/maven2/com/thoughtworks/qdox/qdox/${version/'~'/'-'}/${name}-${version/'~'/'-'}-project.tar.gz" -O "${name}-${version}.orig.tar.gz"
 
 rm -rf tarball-tmp
 mkdir tarball-tmp
 cd tarball-tmp
-tar xf "../${name}-${version}-${vertag}.orig.tar.gz"
+tar xf "../${name}-${version}.orig.tar.gz"
 
 # CLEAN TARBALL
 find -name '*.jar' -delete
@@ -19,6 +18,6 @@ find -name '*.class' -delete
 # contains possibly proprietary binaries of YACC
 rm -r */bootstrap
 
-tar cf "../${name}-${version}-${vertag}.tar.gz" *
+tar cf "../${name}-${version}.tar.gz" *
 cd ..
-rm -r tarball-tmp "${name}-${version}-${vertag}.orig.tar.gz"
+rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

SPECS/qdox.spec

@@ -1,20 +1,20 @@
-%global vertag  M9
+%global upstream_version %(echo %{version} | tr '~' '-')
 
-Summary:        Extract class/interface/method definitions from sources
 Name:           qdox
-Version:        2.0
-Release:        3.%{vertag}%{?dist}
-Epoch:          0
+Version:        2.0~M10
+Release:        2%{?dist}
+Summary:        Extract class/interface/method definitions from sources
 License:        ASL 2.0
 URL:            https://github.com/paul-hammant/qdox
 BuildArch:      noarch
 
 # ./generate-tarball.sh
-Source0:        %{name}-%{version}-%{vertag}.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 Source1:        qdox-MANIFEST.MF
 # Remove bundled binaries which are possibly proprietary
 Source2:        generate-tarball.sh
 
+Patch0:         0001-Port-to-JFlex-1.7.0.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
@@ -38,11 +38,9 @@ Summary:        Javadoc for %{name}
 %description javadoc
 API docs for %{name}.
 
-
 %prep
-%setup -q -n %{name}-%{version}-%{vertag}
-find -name *.jar -delete
-rm -rf bootstrap
+%setup -q -n %{name}-%{upstream_version}
+%patch0 -p1
 
 # We don't need these plugins
 %pom_remove_plugin :animal-sniffer-maven-plugin
@@ -57,14 +55,14 @@ rm -rf bootstrap
 
 %build
 # Generate scanners (upstream does this with maven-jflex-plugin)
-jflex --inputstreamctor -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/lexer.flex
-jflex --inputstreamctor -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexer.flex
+jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/lexer.flex
+jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexer.flex
 
 # Build artifact
 %mvn_build -f -- -Dqdox.byaccj.executable=byaccj
 
 # Inject OSGi manifests
-jar ufm target/%{name}-%{version}*.jar %{SOURCE1}
+jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1}
 
 %install
 %mvn_install
@@ -76,6 +74,18 @@ jar ufm target/%{name}-%{version}*.jar %{SOURCE1}
 %doc LICENSE.txt
 
 %changelog
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0~M10-2
+- Mass rebuild for javapackages-tools 201902
+
+* Wed Sep 18 2019 Marian Koncek <mkoncek@redhat.com> - 2.0~M10-1
+- Update to upstream version 2.0~M10
+
+* Fri Jun 07 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-5.M9
+- Port to JFlex 1.7.0
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-4.M9
+- Mass rebuild for javapackages-tools 201901
+
 * Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 0:2.0-3.M9
 - Repack tarball to remove possibly proprietary binaries