Hello community, here is the log from the commit of package bcel for openSUSE:Factory checked in at 2017-09-29 11:54:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bcel (Old) and /work/SRC/openSUSE:Factory/.bcel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bcel" Fri Sep 29 11:54:32 2017 rev:26 rq:529838 version:5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/bcel/bcel.changes 2017-05-31 13:31:53.590169379 +0200 +++ /work/SRC/openSUSE:Factory/.bcel.new/bcel.changes 2017-09-29 11:54:35.505525445 +0200 @@ -1,0 +2,9 @@ +Wed Sep 27 17:05:58 UTC 2017 - [email protected] + +- Allow building with any java-devel provider +- Specify java source and target level 1.6 to fix build with jdk9 +- Added patch: + * bcel-5.2-encoding.patch + + specify the correct encoding of the files + +------------------------------------------------------------------- New: ---- bcel-5.2-encoding.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bcel.spec ++++++ --- /var/tmp/diff_new_pack.kOQJ8Z/_old 2017-09-29 11:54:36.201427316 +0200 +++ /var/tmp/diff_new_pack.kOQJ8Z/_new 2017-09-29 11:54:36.205426752 +0200 @@ -26,20 +26,18 @@ Source0: http://www.apache.org/dist/commons/bcel/source/%{name}-%{version}-src.tar.gz Source1: http://www.apache.org/dist/commons/bcel/source/%{name}-%{version}-src.tar.gz.asc Source2: bcel.keyring +Patch0: bcel-5.2-encoding.patch BuildRequires: ant -BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: java-devel BuildRequires: regexp -#BuildRequires: xerces-j2-bootstrap -#!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 -#!BuildIgnore: xml-commons-jaxp-1.3-apis -#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel -#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel -#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel -#!BuildIgnore: java-9-openjdk java-9-openjdk-devel -#!BuildIgnore: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap +#!BuildIgnore: xerces-j2 +#!BuildIgnore: xerces-j2-bootstrap +#!BuildIgnore: xml-commons +#!BuildIgnore: xml-commons-apis +#!BuildIgnore: xml-commons-jaxp-1.3-apis +#!BuildIgnore: xml-commons-resolver Requires: regexp -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -66,6 +64,7 @@ %prep %setup -q +%patch0 -p1 # remove all binary libs find . -name "*.jar" -exec rm -f {} \; # very broken build @@ -75,8 +74,14 @@ %build export CLASSPATH=%(build-classpath regexp) export OPT_JAR_LIST="ant/ant-nodeps" -ant -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} compile -ant -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} jar +ant \ + -Dant.build.javac.target=1.6 -Dant.build.javac.source=1.6 \ + -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} \ + compile +ant \ + -Dant.build.javac.target=1.6 -Dant.build.javac.source=1.6 \ + -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} \ + jar %install # jars @@ -85,7 +90,6 @@ (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed "s|-%{version}||g"`; done) %files -%defattr(0644,root,root,0755) %doc LICENSE.txt %{_javadir}/* ++++++ bcel-5.2-encoding.patch ++++++ --- bcel-5.2/build.xml 2017-09-27 18:59:57.110434113 +0200 +++ bcel-5.2/build.xml 2017-09-27 19:00:39.286692143 +0200 @@ -39,7 +39,7 @@ <target name="compile" description="o Compile the code" depends="get-deps"> <mkdir dir="${classesdir}"> </mkdir> - <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> + <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" encoding="ISO-8859-1" excludes="**/package.html"> <src> <pathelement location="src/java"> </pathelement>
