Hello community, here is the log from the commit of package jflex for openSUSE:Factory checked in at 2017-10-06 10:55:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jflex (Old) and /work/SRC/openSUSE:Factory/.jflex.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jflex" Fri Oct 6 10:55:19 2017 rev:19 rq:531061 version:1.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/jflex/jflex-bootstrap.changes 2013-12-03 09:06:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.jflex.new/jflex-bootstrap.changes 2017-10-06 10:55:20.466906400 +0200 @@ -2 +2 @@ -Mon Dec 2 12:44:30 UTC 2013 - [email protected] +Wed Oct 4 07:49:17 UTC 2017 - [email protected] @@ -4 +4,16 @@ -- conflicts with non-bootstrap variant +- Removed a jflex-lex-scan.patch again, so that bot is happy + +------------------------------------------------------------------- +Tue Oct 3 17:31:18 UTC 2017 - [email protected] + +- Don't BuildRequire java-1_5_0-gcj-compat-devel, since it will be + soon gone; BuildRequire java-devel +- Build with java source and target level 1.6 to allow building + with jdk9 +- Sync the bootstrap and non-bootstrap spec files using the + jpackage-bootstrap-prepare.sh script and clean spec file + +------------------------------------------------------------------- +Mon Dec 2 12:44:19 UTC 2013 - [email protected] + +- conflict the non-bootstrap variant with the bootstrap variant --- /work/SRC/openSUSE:Factory/jflex/jflex.changes 2013-12-03 09:06:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.jflex.new/jflex.changes 2017-10-06 10:55:20.502900959 +0200 @@ -1,0 +2,15 @@ +Wed Oct 4 07:49:17 UTC 2017 - [email protected] + +- Removed a jflex-lex-scan.patch again, so that bot is happy + +------------------------------------------------------------------- +Tue Oct 3 17:31:18 UTC 2017 - [email protected] + +- Don't BuildRequire java-1_5_0-gcj-compat-devel, since it will be + soon gone; BuildRequire java-devel +- Build with java source and target level 1.6 to allow building + with jdk9 +- Sync the bootstrap and non-bootstrap spec files using the + jpackage-bootstrap-prepare.sh script and clean spec file + +------------------------------------------------------------------- @@ -4 +19 @@ -- conflicts with bootstrap variant +- conflict the non-bootstrap variant with the bootstrap variant Old: ---- jflex-lex-scan.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jflex-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.XQNvjb/_old 2017-10-06 10:55:21.314778245 +0200 +++ /var/tmp/diff_new_pack.XQNvjb/_new 2017-10-06 10:55:21.314778245 +0200 @@ -1,7 +1,7 @@ # # spec file for package jflex-bootstrap # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,9 @@ %define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} %define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} - ##### WARNING: please do not edit this auto generated spec file. Use the jflex.spec! ##### %define with_bootstrap 1 -%bcond_with bootstrap - %define section free - Name: jflex-bootstrap # This line is not a comment, please do not remove it! #%(sh %{_sourcedir}/jpackage-bootstrap-prepare.sh %{_sourcedir} %{name}) @@ -38,22 +34,26 @@ Url: http://www.jflex.de/ Source0: http://www.jflex.de/jflex-%{version}.tar.bz2 Source1: jflex.script +Source100: jpackage-bootstrap-prepare.sh Patch0: jflex-javac-no-target.patch Patch1: jflex-no-cup-no-jflex.patch Patch2: jflex-classpath.patch -Patch3: jflex-lex-scan.patch Patch4: jflex-byaccj-utl.patch -Requires: java_cup -Requires: javapackages-tools +#PATCH-FIX-OPENSUSE: make AllTests.main empty, code was not compatible with junit 4 +Patch5: jflex-junit4.patch BuildRequires: ant BuildRequires: java-cup-bootstrap +BuildRequires: java-devel +Requires: java_cup +Requires: javapackages-tools +BuildArch: noarch %if %without bootstrap BuildRequires: jflex-bootstrap BuildRequires: junit +Conflicts: jflex-bootstrap +%else +Conflicts: jflex %endif -BuildRequires: java-1_5_0-gcj-compat-devel -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description JFlex is a lexical analyzer generator for Java written in Java. It is @@ -71,7 +71,6 @@ * JLex compatibility %if %without bootstrap - %package doc Summary: Documentation and examples for %{name} Group: Development/Libraries/Java @@ -96,15 +95,15 @@ %prep %setup -q -n jflex-%{version} -%{__perl} -pi -e 's/\r$//g' examples/standalone/sample.inp -%{__rm} -rf src/java_cup -find . -name '*.jar' | xargs -t %{__rm} +perl -pi -e 's/\r$//g' examples/standalone/sample.inp +rm -rf src/java_cup +find . -name '*.jar' | xargs -t rm %if %without bootstrap export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit jflex) export OPT_JAR_LIST=: pushd src -%ant realclean -%ant jflex +%{ant} realclean +%{ant} -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jflex popd %endif %patch0 -p1 @@ -117,8 +116,8 @@ %else # with bootstrap # You must use Re jflex.spec and have a java-cup and jflex installed %patch2 -p1 -#%patch3 -p1 %patch4 -p1 +%patch5 -p1 %endif %build @@ -130,23 +129,22 @@ %endif export OPT_JAR_LIST=: echo `pwd` -%ant jar +%{ant} -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar popd %install # jar -%{__mkdir_p} %{buildroot}%{_javadir} -%{__cp} -a lib/JFlex.jar %{buildroot}%{_javadir}/jflex-%{version}.jar -(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +mkdir -p %{buildroot}%{_javadir} +cp -a lib/JFlex.jar %{buildroot}%{_javadir}/jflex-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # compatibility symlink -(cd %{buildroot}%{_javadir} && %{__ln_s} jflex.jar JFlex.jar) +(cd %{buildroot}%{_javadir} && ln -s jflex.jar JFlex.jar) -%{__mkdir_p} %{buildroot}%{_bindir} -%{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/jflex +mkdir -p %{buildroot}%{_bindir} +install -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/jflex %files -%defattr(0644,root,root,0755) %doc COPYRIGHT src/README src/changelog %attr(0755,root,root) %{_bindir}/jflex %{_javadir}/jflex.jar @@ -154,9 +152,7 @@ %{_javadir}/JFlex.jar %if %without bootstrap - %files doc -%defattr(0644,root,root,0755) %doc examples doc %endif ++++++ jflex.spec ++++++ --- /var/tmp/diff_new_pack.XQNvjb/_old 2017-10-06 10:55:21.342774013 +0200 +++ /var/tmp/diff_new_pack.XQNvjb/_new 2017-10-06 10:55:21.342774013 +0200 @@ -1,7 +1,7 @@ # # spec file for package jflex # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,8 @@ %define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} %define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} - %define _without_bootstrap 1 -%bcond_with bootstrap - %define section free - Name: jflex # This line is not a comment, please do not remove it! #%(sh %{_sourcedir}/jpackage-bootstrap-prepare.sh %{_sourcedir} %{name}) @@ -37,17 +33,19 @@ Url: http://www.jflex.de/ Source0: http://www.jflex.de/jflex-%{version}.tar.bz2 Source1: jflex.script +Source100: jpackage-bootstrap-prepare.sh Patch0: jflex-javac-no-target.patch Patch1: jflex-no-cup-no-jflex.patch Patch2: jflex-classpath.patch -Patch3: jflex-lex-scan.patch Patch4: jflex-byaccj-utl.patch #PATCH-FIX-OPENSUSE: make AllTests.main empty, code was not compatible with junit 4 Patch5: jflex-junit4.patch -Requires: java_cup -Requires: javapackages-tools BuildRequires: ant BuildRequires: java-cup-bootstrap +BuildRequires: java-devel +Requires: java_cup +Requires: javapackages-tools +BuildArch: noarch %if %without bootstrap BuildRequires: jflex-bootstrap BuildRequires: junit @@ -55,9 +53,6 @@ %else Conflicts: jflex %endif -BuildRequires: java-1_5_0-gcj-compat-devel -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description JFlex is a lexical analyzer generator for Java written in Java. It is @@ -75,7 +70,6 @@ * JLex compatibility %if %without bootstrap - %package doc Summary: Documentation and examples for %{name} Group: Development/Libraries/Java @@ -100,15 +94,15 @@ %prep %setup -q -n jflex-%{version} -%{__perl} -pi -e 's/\r$//g' examples/standalone/sample.inp -%{__rm} -rf src/java_cup -find . -name '*.jar' | xargs -t %{__rm} +perl -pi -e 's/\r$//g' examples/standalone/sample.inp +rm -rf src/java_cup +find . -name '*.jar' | xargs -t rm %if %without bootstrap export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit jflex) export OPT_JAR_LIST=: pushd src -%ant realclean -%ant jflex +%{ant} realclean +%{ant} -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jflex popd %endif %patch0 -p1 @@ -121,10 +115,9 @@ %else # with bootstrap # You must use Re jflex.spec and have a java-cup and jflex installed %patch2 -p1 -#%patch3 -p1 %patch4 -p1 -%endif %patch5 -p1 +%endif %build pushd src @@ -135,23 +128,22 @@ %endif export OPT_JAR_LIST=: echo `pwd` -%ant jar +%{ant} -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar popd %install # jar -%{__mkdir_p} %{buildroot}%{_javadir} -%{__cp} -a lib/JFlex.jar %{buildroot}%{_javadir}/jflex-%{version}.jar -(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +mkdir -p %{buildroot}%{_javadir} +cp -a lib/JFlex.jar %{buildroot}%{_javadir}/jflex-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # compatibility symlink -(cd %{buildroot}%{_javadir} && %{__ln_s} jflex.jar JFlex.jar) +(cd %{buildroot}%{_javadir} && ln -s jflex.jar JFlex.jar) -%{__mkdir_p} %{buildroot}%{_bindir} -%{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/jflex +mkdir -p %{buildroot}%{_bindir} +install -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/jflex %files -%defattr(0644,root,root,0755) %doc COPYRIGHT src/README src/changelog %attr(0755,root,root) %{_bindir}/jflex %{_javadir}/jflex.jar @@ -159,9 +151,7 @@ %{_javadir}/JFlex.jar %if %without bootstrap - %files doc -%defattr(0644,root,root,0755) %doc examples doc %endif
