Compare commits

...

No commits in common. "c8-stream-201902" and "stream-javapackages-tools-202201-rhel-9.1.0" have entirely different histories.

7 changed files with 100 additions and 20 deletions

18
.gitignore vendored
View File

@ -1 +1,17 @@
SOURCES/qdox-2.0~M10.tar.gz /results_*
/*.src.rpm
/qdox-1.6.1-src.tar.gz
/qdox-1.9.2-src.tar.gz
/qdox-1.10.1.tar.bz2
/qdox-1.11-project.tar.bz2
/qdox-1.12-project.tar.bz2
/qdox-1.12.1-project.tar.bz2
/qdox-2.0-M2-project.tar.gz
/qdox-2.0-M3-project.tar.gz
/qdox-2.0-M5-project.tar.gz
/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

View File

@ -1 +0,0 @@
23152becb77e6cbae4f4587bb557af3441f6734f SOURCES/qdox-2.0~M10.tar.gz

View File

@ -5,12 +5,12 @@ name=qdox
version="$(sed -n 's/Version:\s*//p' *.spec)" version="$(sed -n 's/Version:\s*//p' *.spec)"
# RETRIEVE # 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 rm -rf tarball-tmp
mkdir 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 # CLEAN TARBALL
find -name '*.jar' -delete find -name '*.jar' -delete
@ -18,6 +18,6 @@ find -name '*.class' -delete
# contains possibly proprietary binaries of YACC # contains possibly proprietary binaries of YACC
rm -r */bootstrap 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" rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

View File

@ -1,12 +1,15 @@
%bcond_with bootstrap
%global upstream_version %(echo %{version} | tr '~' '-') %global upstream_version %(echo %{version} | tr '~' '-')
Name: qdox Name: qdox
Version: 2.0~M10 Version: 2.0.0
Release: 2%{?dist} Release: 10%{?dist}
Summary: Extract class/interface/method definitions from sources Summary: Extract class/interface/method definitions from sources
License: ASL 2.0 License: ASL 2.0
URL: https://github.com/paul-hammant/qdox URL: https://github.com/paul-hammant/qdox
BuildArch: noarch BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
# ./generate-tarball.sh # ./generate-tarball.sh
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
@ -16,14 +19,13 @@ Source2: generate-tarball.sh
Patch0: 0001-Port-to-JFlex-1.7.0.patch 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 BuildRequires: byaccj
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
BuildRequires: jflex BuildRequires: jflex
%endif
%description %description
QDox is a high speed, small footprint parser QDox is a high speed, small footprint parser
@ -42,24 +44,36 @@ API docs for %{name}.
%setup -q -n %{name}-%{upstream_version} %setup -q -n %{name}-%{upstream_version}
%patch0 -p1 %patch0 -p1
# remove unnecessary dependency on parent POM
%pom_remove_parent
# We don't need these plugins # We don't need these plugins
%pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :animal-sniffer-maven-plugin
%pom_remove_plugin :maven-assembly-plugin
%pom_remove_plugin :maven-failsafe-plugin %pom_remove_plugin :maven-failsafe-plugin
%pom_remove_plugin :maven-invoker-plugin
%pom_remove_plugin :maven-jflex-plugin %pom_remove_plugin :maven-jflex-plugin
%pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-enforcer-plugin
%pom_remove_plugin :exec-maven-plugin
%mvn_file : %{name} %mvn_file : %{name}
%mvn_alias : qdox:qdox %mvn_alias : qdox:qdox
%pom_xpath_set pom:workingDirectory '${basedir}/src/main/java/com/thoughtworks/qdox/parser/impl'
%build %build
%{?jpb_env}
# Generate scanners (upstream does this with maven-jflex-plugin) # 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/lexer.flex
jflex -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/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 # Build artifact
%mvn_build -f -- -Dqdox.byaccj.executable=byaccj %mvn_build -f -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7
# Inject OSGi manifests # Inject OSGi manifests
jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1} jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1}
@ -68,24 +82,74 @@ jar ufm target/%{name}-%{upstream_version}.jar %{SOURCE1}
%mvn_install %mvn_install
%files -f .mfiles %files -f .mfiles
%doc LICENSE.txt README.md %license LICENSE.txt
%doc README.md
%files javadoc -f .mfiles-javadoc %files javadoc -f .mfiles-javadoc
%doc LICENSE.txt %license LICENSE.txt
%changelog %changelog
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.0.0-9
- Rebuilt for java-17-openjdk as system jdk
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-7
- Set explicit Java compiler source/target levels to 1.7
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* 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 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0~M10-2
- Mass rebuild for javapackages-tools 201902 - Mass rebuild for javapackages-tools 201902
* Wed Sep 18 2019 Marian Koncek <mkoncek@redhat.com> - 2.0~M10-1 * Wed Sep 18 2019 Marian Koncek <mkoncek@redhat.com> - 2.0~M10-1
- Update to upstream version 2.0~M10 - 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 * Fri Jun 07 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-5.M9
- Port to JFlex 1.7.0 - Port to JFlex 1.7.0
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-4.M9 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-4.M9
- Mass rebuild for javapackages-tools 201901 - 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 * Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 0:2.0-3.M9
- Repack tarball to remove possibly proprietary binaries - Repack tarball to remove possibly proprietary binaries

1
sources Normal file
View File

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