.gitignore

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

.qdox.metadata

@@ -1 +1 @@
-23152becb77e6cbae4f4587bb557af3441f6734f SOURCES/qdox-2.0~M10.tar.gz
+7ee11d8c5264431d3a670ceaa29bc19435ed9772 SOURCES/qdox-2.0.0.tar.gz

SOURCES/generate-tarball.sh

@@ -5,12 +5,12 @@ name=qdox
 version="$(sed -n 's/Version:\s*//p' *.spec)"
 
 # RETRIEVE
-wget "http://repo2.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
+pushd tarball-tmp
-tar xf "../${name}-${version}.orig.tar.gz"
+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" *
+tar -czf "../${name}-${version}.tar.gz" *
-cd ..
+popd
 rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

SPECS/qdox.spec

@@ -1,8 +1,10 @@
+%bcond_with bootstrap
+
 %global upstream_version %(echo %{version} | tr '~' '-')
 
 Name:           qdox
-Version:        2.0~M10
+Version:        2.0.0
-Release:        2%{?dist}
+Release:        8%{?dist}
 Summary:        Extract class/interface/method definitions from sources
 License:        ASL 2.0
 URL:            https://github.com/paul-hammant/qdox
@@ -17,13 +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:  mvn(org.sonatype.oss:oss-parent:pom:)
-
 BuildRequires:  byaccj
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  jflex
+%endif
 
 %description
 QDox is a high speed, small footprint parser
@@ -42,24 +43,36 @@ API docs for %{name}.
 %setup -q -n %{name}-%{upstream_version}
 %patch0 -p1
 
+# 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}-%{upstream_version}.jar %{SOURCE1}
@@ -68,24 +81,69 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1}
 %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
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.0-8
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-7
+- Rebuild to workaround DistroBaker issue
+
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-6
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-5
+- Bootstrap build
+- Non-bootstrap build
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* 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.
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-8.M9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* 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
+
 * Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 0:2.0-3.M9
 - Repack tarball to remove possibly proprietary binaries