Merge modular branch

.gitignore

@@ -13,4 +13,5 @@
 /qdox-2.0-M7-project.tar.gz
 /qdox-2.0-M9-project.tar.gz
 /qdox-2.0-M9.tar.gz
+/qdox-2.0~M10.tar.gz
 /qdox-2.0.0.tar.gz

generate-tarball.sh

@@ -5,12 +5,12 @@ name=qdox
 version="$(sed -n 's/Version:\s*//p' *.spec)"
 
 # RETRIEVE
-wget "https://repo1.maven.org/maven2/com/thoughtworks/qdox/qdox/${version}/${name}-${version}-project.tar.gz" -O "${name}-${version}.orig.tar.gz"
+wget "https://repo1.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}.orig.tar.gz"
+pushd tarball-tmp
+tar -xf "../${name}-${version}.orig.tar.gz"
 
 # CLEAN TARBALL
 find -name '*.jar' -delete
@@ -18,6 +18,6 @@ find -name '*.class' -delete
 # contains possibly proprietary binaries of YACC
 rm -r */bootstrap
 
-tar cf "../${name}-${version}.tar.gz" *
-cd ..
+tar -czf "../${name}-${version}.tar.gz" *
+popd
 rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

qdox.spec

@@ -1,8 +1,11 @@
-Summary:        Extract class/interface/method definitions from sources
+%bcond_with bootstrap
+
+%global upstream_version %(echo %{version} | tr '~' '-')
+
 Name:           qdox
 Version:        2.0.0
 Release:        4%{?dist}
-Epoch:          0
+Summary:        Extract class/interface/method definitions from sources
 License:        ASL 2.0
 URL:            https://github.com/paul-hammant/qdox
 BuildArch:      noarch
@@ -16,12 +19,12 @@ 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)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-invoker-plugin)
-BuildRequires:  mvn(org.codehaus.mojo:exec-maven-plugin)
-
 BuildRequires:  byaccj
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  jflex
+%endif
 
 %description
 QDox is a high speed, small footprint parser
@@ -36,48 +39,53 @@ Summary:        Javadoc for %{name}
 %description javadoc
 API docs for %{name}.
 
-
 %prep
-%setup -q
-
+%setup -q -n %{name}-%{upstream_version}
 %patch0 -p1
 
-find -name *.jar -delete
-rm -rf bootstrap
-
 # remove unnecessary dependency on parent POM
 %pom_remove_parent
 
 # We don't need these plugins
 %pom_remove_plugin :animal-sniffer-maven-plugin
+%pom_remove_plugin :maven-assembly-plugin
 %pom_remove_plugin :maven-failsafe-plugin
+%pom_remove_plugin :maven-invoker-plugin
 %pom_remove_plugin :maven-jflex-plugin
 %pom_remove_plugin :maven-enforcer-plugin
+%pom_remove_plugin :exec-maven-plugin
 
 %mvn_file : %{name}
 %mvn_alias : qdox:qdox
 
-%pom_xpath_set pom:workingDirectory '${basedir}/src/main/java/com/thoughtworks/qdox/parser/impl'
-
 %build
+%{?jpb_env}
+
 # Generate scanners (upstream does this with maven-jflex-plugin)
 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
 
+# Generate parsers (upstream does this with exec-maven-plugin)
+(cd ./src/main/java/com/thoughtworks/qdox/parser/impl
+ byaccj -v -Jnorun -Jnoconstruct -Jclass=DefaultJavaCommentParser -Jpackage=com.thoughtworks.qdox.parser.impl ../../../../../../../grammar/commentparser.y
+ byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser -Jimplements=CommentHandler -Jsemantic=Value -Jpackage=com.thoughtworks.qdox.parser.impl -Jstack=500 ../../../../../../../grammar/parser.y
+)
+
 # Build artifact
-%mvn_build -f -- -Dqdox.byaccj.executable=byaccj
+%mvn_build -f
 
 # Inject OSGi manifests
-jar ufm target/%{name}-%{version}*.jar %{SOURCE1}
+jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1}
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE.txt README.md
+%license LICENSE.txt
+%doc README.md
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt
+%license LICENSE.txt
 
 %changelog
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.0-4
@@ -89,6 +97,9 @@ jar ufm target/%{name}-%{version}*.jar %{SOURCE1}
 * Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:2.0.0-2
 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
 
+* Wed Feb 26 2020 Marian Koncek <mkoncek@redhat.com> - 2.0.0-1
+- Update to upstream version 2.0.0
+
 * Thu Feb 13 2020 Fabio Valentini <decathorpe@gmail.com> - 0:2.0.0-1
 - Update to version 2.0.0.
 
@@ -98,12 +109,24 @@ jar ufm target/%{name}-%{version}*.jar %{SOURCE1}
 * Fri Nov 22 2019 Fabio Valentini <decathorpe@gmail.com> - 0:2.0-7.M9
 - Remove unnecessary dependency on parent POM.
 
+* 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
+
 * Sun Aug 18 2019 Fabio Valentini <decathorpe@gmail.com> - 0:2.0-6.M9
 - Port to jflex 1.7.0.
 
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-5.M9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* 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
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-4.M9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (qdox-2.0.0.tar.gz) = b17821fdcfe4daafe76d3f72cc29fd51c27cbf78e07c62c938803b4b0e6855634741f58cab5bba882a9337049da3ee42333b5b43d6398b199091cf344c36a388
+SHA512 (qdox-2.0.0.tar.gz) = 2ea7bd97ca720856a3f61aa12d4ec681708b599fe87c8942ac19e41b59cb56d3583f0953dc280d6244334d19762b7fe0c5693ee7acbaff2a4b421a3c959139b6