PR#1: update to version 1.7.0 - rpms/jflex

rpms / jflex

#1 update to version 1.7.0

Merged 4 years ago by decathorpe. Opened 4 years ago by decathorpe.

Unknown source master into master

update to version 1.7.0

Fabio Valentini • 4 years ago

9c333c1

.gitignore

file modified

+6 -2

		`@@ -1,7 +1,11 @@`
		`- jflex-1.4.1.tar.gz`
		`- jflex-1.4.3.tar.gz`
		`+ /results_*`
		`+ /*.src.rpm`
		`+`
		`+ /jflex-1.4.1.tar.gz`
		`+ /jflex-1.4.3.tar.gz`
		`/jflex-1.4.3-clean.tar.gz`
		`/jflex-1.5.0-clean.tar.gz`
		`/jflex-1.5.1-clean.tar.gz`
		`/jflex-1.6.0-clean.tar.gz`
		`/jflex-1.6.1-clean.tar.gz`
		`+ /jflex-1.7.0-clean.tar.gz`

create-tarball.sh

file modified

+1 -1

		`@@ -8,7 +8,7 @@`
		`VERSION=${1}`
		`NAME="jflex"`

		`- wget http://jflex.de/${NAME}-${VERSION}.tar.gz`
		`+ wget http://jflex.de/release/${NAME}-${VERSION}.tar.gz`
		`tar xvf ${NAME}-${VERSION}.tar.gz`

		`(`

jflex.spec

file modified

+27 -9

		`@@ -3,8 +3,8 @@`

		`Summary: Fast Scanner Generator`
		`Name: jflex`
		`- Version: 1.6.1`
		`- Release: 14%{?dist}`
		`+ Version: 1.7.0`
		`+ Release: 1%{?dist}`
		`License: BSD`
		`URL: http://jflex.de/`
		`BuildArch: noarch`
		`@@ -16,20 +16,21 @@`
		`Source4: %{name}.1`
		`Source5: create-tarball.sh`

		`- BuildRequires: maven-local`
		`- BuildRequires: ant`
		`BuildRequires: jflex`
		`- BuildRequires: junit`
		`- BuildRequires: sonatype-oss-parent`
		`- BuildRequires: java-devel`
		`- BuildRequires: java_cup`
		`+ BuildRequires: maven-local`
		`+ BuildRequires: mvn(java_cup:java_cup)`
		`+ BuildRequires: mvn(junit:junit)`
		`+ BuildRequires: mvn(org.apache.ant:ant)`
		`+`
		`%if %{with desktop}`
		`BuildRequires: desktop-file-utils`
		`%endif`
		`+`
		`%if %{with emacs}`
		`BuildRequires: emacs`
		`Requires: emacs-filesystem >= %{_emacs_version}`
		`%endif`
		`+`
		`# Explicit javapackages-tools requires since scripts use`
		`# /usr/share/java-utils/java-functions`
		`Requires: javapackages-tools`
		`@@ -56,13 +57,27 @@`
		`%mvn_file : %{name}`
		`%pom_add_dep java_cup:java_cup`

		`- %pom_remove_plugin :maven-antrun-plugin`
		`%pom_remove_plugin :jflex-maven-plugin`
		`+ %pom_remove_plugin :cup-maven-plugin`
		`+ %pom_remove_plugin :maven-shade-plugin`
		`+ %pom_remove_dep :cup_runtime`

		`# Tests fail with 320k stacks (default on i686), so lets increase`
		`# stack to 16M to avoid stack overflows. See rhbz#1119308`
		`%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:configuration" "<argLine>-Xss16384k</argLine>"`

		`+ %pom_xpath_remove "pom:plugin[pom:artifactId='maven-site-plugin']" parent.xml`
		`+ %pom_xpath_remove "pom:plugin[pom:artifactId='fmt-maven-plugin']" parent.xml`
		`+ %pom_xpath_remove "pom:plugin[pom:artifactId='cup-maven-plugin']" parent.xml`
		`+ %pom_xpath_remove "pom:plugin[pom:artifactId='maven-shade-plugin']" parent.xml`
		`+`
		`+ %pom_xpath_remove "pom:dependency[pom:artifactId='plexus-compiler-javac-errorprone']" parent.xml`
		`+ %pom_xpath_remove "pom:dependency[pom:artifactId='error_prone_core']" parent.xml`
		`+ %pom_xpath_remove "pom:compilerId" parent.xml`
		`+ %pom_xpath_remove "pom:compilerArgs" parent.xml`
		`+`
		`+ sed -i /%%inputstreamctor/d src/main/jflex/LexScan.flex`
		`+`
		`%build`
		`java -jar $(find-jar java_cup) -parser LexParse -interface -destdir src/main/java src/main/cup/LexParse.cup`
		`jflex -d src/main/java/jflex --skel src/main/jflex/skeleton.nested src/main/jflex/LexScan.flex`
		`@@ -116,6 +131,9 @@`


		`%changelog`
		`+ * Wed Aug 14 2019 Fabio Valentini <decathorpe@gmail.com> - 1.7.0-1`
		`+ - Update to version 1.7.0.`
		`+`
		`* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-14`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- 90af12c08afe8aef549df5770785a917 jflex-1.6.1-clean.tar.gz`
		`+ SHA512 (jflex-1.7.0-clean.tar.gz) = e43209af453c6557796f00d5c685e5840b0013521d28e6dadcd53e689d72b5b596f1e71eacf1bf0f1b35ef9c6ddd8ee0a846900ba970f427752c04c08c794032`

decathorpe commented 4 years ago

This requires a patch for qdox (which I will push with another PR shortly).

The update to 1.7.0 is already available from MBI and the modular branches.

decathorpe commented 4 years ago

PR for qdox: https://src.fedoraproject.org/rpms/qdox/pull-request/1

decathorpe commented 4 years ago

Test rebuilds of dependent packages were successful (including the pending changes for qdox, and cassandra was already broken in rawhide):

https://copr.fedorainfracloud.org/coprs/decathorpe/jflex-pr/monitor/

cipherboy commented 4 years ago

AI cipherboy: make create_tarball.sh reproducible.

The SHA512 won't ever match the original source because we remove the already created jar files. This is fine I suppose, but the other problem is that create_tarball.sh isn't reproducible because the ordering is the random. We'd have to create a new name for the tarball to fix it this time, so I'll do it for next time.

ACKing this, this is fine.

Pull-Request has been merged by decathorpe

4 years ago