Hello community, here is the log from the commit of package javacc for openSUSE:Factory checked in at 2017-09-20 17:09:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javacc (Old) and /work/SRC/openSUSE:Factory/.javacc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javacc" Wed Sep 20 17:09:31 2017 rev:19 rq:527074 version:5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/javacc/javacc.changes 2017-01-10 10:48:55.333358888 +0100 +++ /work/SRC/openSUSE:Factory/.javacc.new/javacc.changes 2017-09-20 17:09:32.336177720 +0200 @@ -1,0 +2,5 @@ +Mon Sep 18 16:25:17 UTC 2017 - [email protected] + +- Fix build with jdk9: specify java source and target 1.6 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javacc.spec ++++++ --- /var/tmp/diff_new_pack.b5cFkI/_old 2017-09-20 17:09:32.980087078 +0200 +++ /var/tmp/diff_new_pack.b5cFkI/_new 2017-09-20 17:09:32.984086515 +0200 @@ -29,10 +29,10 @@ Source3: jjtree Patch0: javacc.patch BuildRequires: ant +BuildRequires: fdupes BuildRequires: java-devel BuildRequires: xml-commons-apis Requires: javapackages-tools -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -79,13 +79,8 @@ mv www/doc . %build -for file in `find -name build.xml` ; do - if ! grep -q "javac.*source=" $file ; then - perl -p -i -e 's|<javac |<javac source=\"1.4\" |' $file - perl -p -i -e 's|<javadoc |<javadoc source=\"1.4" |' $file - fi -done ant \ + -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ -Dversion=%{version} \ jar @@ -97,20 +92,18 @@ install -m 755 javacc jjdoc jjtree %{buildroot}%{_prefix}/bin install -d -m 755 %{buildroot}%{_datadir}/%{name} cp -pr examples %{buildroot}%{_datadir}/%{name} +%fdupes -s %{buildroot}%{_datadir}/%{name} %files -%defattr(0644,root,root,0755) %{_javadir}/*.jar %doc LICENSE README %defattr(0755,root,root,0755) %{_bindir}/* %files manual -%defattr(0644,root,root,0755) %doc doc/* %files demo -%defattr(0644,root,root,0755) %{_datadir}/%{name}/ %changelog
