Hello community, here is the log from the commit of package javacc3 for openSUSE:Factory checked in at 2017-10-10 11:39:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javacc3 (Old) and /work/SRC/openSUSE:Factory/.javacc3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javacc3" Tue Oct 10 11:39:48 2017 rev:16 rq:532192 version:3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/javacc3/javacc3.changes 2017-09-13 22:22:44.467753533 +0200 +++ /work/SRC/openSUSE:Factory/.javacc3.new/javacc3.changes 2017-10-10 11:39:50.219766392 +0200 @@ -1,0 +2,12 @@ +Fri Oct 6 11:21:25 UTC 2017 - [email protected] + +- Fix build with jdk9 +- Use java source and target 1.6 +- Rename all occurences of enum -> emun (including in + bootstrap/javacc.jar) to avoid clashing with a reserved word in + java5+ +- Added patch: + * javacc-encoding.patch + + specify UTF-8 encoding for relevant files + +------------------------------------------------------------------- New: ---- javacc-encoding.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javacc3.spec ++++++ --- /var/tmp/diff_new_pack.QGY4j3/_old 2017-10-10 11:39:51.131726366 +0200 +++ /var/tmp/diff_new_pack.QGY4j3/_new 2017-10-10 11:39:51.135726190 +0200 @@ -26,24 +26,24 @@ %define repodirsrc %{repodir}/src %define section free %define _basename javacc - Name: javacc3 Version: 3.2 Release: 0 Summary: A parser/scanner generator for java License: SUSE-BSD-3-Clause-with-non-nuclear-addition Group: Development/Libraries/Java +Url: https://javacc.dev.java.net/ Source0: javacc-3.2-src.tar.bz2 Source1: javacc Source2: jjdoc Source3: jjtree Source4: javacc-component-info.xml -Url: https://javacc.dev.java.net/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -Requires: javapackages-tools +Patch0: javacc-encoding.patch BuildRequires: ant -BuildRequires: java-devel = 1.8.0 +BuildRequires: java-devel +BuildRequires: perl +Requires: javapackages-tools +BuildArch: noarch %description Java Compiler Compiler (JavaCC) is the most popular parser generator @@ -54,10 +54,7 @@ generation such as tree building (via a tool called JJTree included with JavaCC), actions, debugging, etc. - - %if %{with_repolib} - %package repolib Summary: A parser/scanner generator for java Group: Development/Libraries/Java @@ -71,8 +68,6 @@ generation such as tree building (via a tool called JJTree included with JavaCC), actions, debugging, etc. - - %endif %package manual @@ -88,8 +83,6 @@ generation such as tree building (via a tool called JJTree included with JavaCC), actions, debugging, etc. - - %package demo Summary: A parser/scanner generator for java Group: Development/Libraries/Java @@ -103,45 +96,45 @@ generation such as tree building (via a tool called JJTree included with JavaCC), actions, debugging, etc. - - %prep %setup -q -n %{_basename}-%{version} +%patch0 -p1 cp %{SOURCE1} javacc3 cp %{SOURCE2} jjdoc3 cp %{SOURCE3} jjtree3 mv www/doc . tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'` sed -i "s/@TAG@/$tag/g" %{SOURCE4} +# enum is a reserved word in java5+. +# For that reason we do this ugly hack that works nevertheless +perl -pi -e 's#enum#emun#g' bootstrap/javacc.jar +perl -pi -e 's#enum#emun#g' $(find . -name "*.java") +perl -pi -e 's#enum#emun#g' $(find . -name "*.jj") %build ant \ - -Dant.build.javac.source=1.4 \ + -Dant.build.javac.source=1.6 \ -Dversion=%{version} \ jar %install -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 bin/lib/%{_basename}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -install -d -m 755 $RPM_BUILD_ROOT/usr/bin -install -m 755 javacc3 jjdoc3 jjtree3 $RPM_BUILD_ROOT/usr/bin -install -d -m 755 $RPM_BUILD_ROOT/usr/share/%{name} -cp -pr examples $RPM_BUILD_ROOT/usr/share/%{name} +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 bin/lib/%{_basename}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +install -d -m 755 %{buildroot}%{_bindir} +install -m 755 javacc3 jjdoc3 jjtree3 %{buildroot}%{_bindir} +install -d -m 755 %{buildroot}%{_datadir}/%{name} +cp -pr examples %{buildroot}%{_datadir}/%{name} %if %{with_repolib} - install -d -m 755 $RPM_BUILD_ROOT%{repodir} - install -d -m 755 $RPM_BUILD_ROOT%{repodirlib} - install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{repodir}/component-info.xml - install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc} - install -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc} - cp $RPM_BUILD_ROOT%{_javadir}/javacc3.jar $RPM_BUILD_ROOT%{repodirlib}/javacc.jar + install -d -m 755 %{buildroot}%{repodir} + install -d -m 755 %{buildroot}%{repodirlib} + install -m 755 %{SOURCE4} %{buildroot}%{repodir}/component-info.xml + install -d -m 755 %{buildroot}%{repodirsrc} + install -m 755 %{SOURCE0} %{buildroot}%{repodirsrc} + cp %{buildroot}%{_javadir}/javacc3.jar %{buildroot}%{repodirlib}/javacc.jar %endif -%clean -rm -rf $RPM_BUILD_ROOT - %files -%defattr(0644,root,root,0755) %{_javadir}/*.jar %doc LICENSE README %defattr(0755,root,root,0755) @@ -150,16 +143,12 @@ %dir %{_javadir}/repository.jboss.com/sun-javacc %files manual -%defattr(0644,root,root,0755) %doc doc/* %files demo -%defattr(0644,root,root,0755) %{_datadir}/%{name} %if %{with_repolib} - %files repolib -%defattr(0644,root,root,0755) %dir %{_javadir}/repository.jboss.com %{repodir} %endif ++++++ javacc-encoding.patch ++++++ --- javacc-3.2/src/org/javacc/parser/build.xml 2003-06-09 22:45:05.000000000 +0200 +++ javacc-3.2.new/src/org/javacc/parser/build.xml 2017-10-06 10:20:43.668673159 +0200 @@ -42,6 +42,7 @@ <javac srcdir="${javacc.root}/src" destdir="${javacc.root}/classes" debug="${build.compiler.debug}" + encoding="UTF-8" classpath="${javacc.root}/classes"> </javac> </target>
