Hello community,
here is the log from the commit of package jakarta-poi for openSUSE:Factory
checked in at 2017-09-20 17:09:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-poi (Old)
and /work/SRC/openSUSE:Factory/.jakarta-poi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-poi"
Wed Sep 20 17:09:22 2017 rev:17 rq:527052 version:2.5.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/jakarta-poi/jakarta-poi.changes 2014-07-16
16:49:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.jakarta-poi.new/jakarta-poi.changes
2017-09-20 17:09:23.677396615 +0200
@@ -1,0 +2,7 @@
+Mon Sep 18 14:47:56 UTC 2017 - fst...@suse.com
+
+- Added patch:
+ * poi-encoding.patch
+ + specify encoding ISO-8859-1 and fix jdk9 build
+
+-------------------------------------------------------------------
New:
----
poi-encoding.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-poi.spec ++++++
--- /var/tmp/diff_new_pack.FMhkH3/_old 2017-09-20 17:09:24.381297528 +0200
+++ /var/tmp/diff_new_pack.FMhkH3/_new 2017-09-20 17:09:24.385296964 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-poi
#
-# Copyright (c) 2014 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
@@ -29,6 +29,7 @@
#cvs -z3 -d :pserver:anon...@cvs.apache.org:/home/cvspublic export -r HEAD
jakarta-poi/src/scratchpad
Source1: poi-scratchpad-unreleased-src-20050824.tar.bz2
Patch0: poi-build_xml.patch
+Patch1: poi-encoding.patch
Patch2: %{name}-%{version}-junittest.patch
BuildRequires: ant >= 1.6
BuildRequires: ant-jdepend >= 1.6
@@ -54,7 +55,6 @@
Requires: log4j >= 1.2.8
Requires: xalan-j2 >= 2.5.2
Requires: xerces-j2 >= 2.6.0
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -107,7 +107,9 @@
rm -rf src/scratchpad/testcases/org/apache/poi/hslf/
# FIXME
rm src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics*.java
+rm src/testcases/org/apache/poi/hssf/HSSFTests.java
%patch0 -b .sav
+%patch1 -b .sav1
%patch2 -b .sav2
# wrong end of line necoding
sed -i -e 's/.$//' \
@@ -119,6 +121,7 @@
docs/apidocs/package-list \
docs/apidocs/stylesheet.css \
docs/junit/stylesheet.css \
+ docs/junit/TESTS-TestSuites.xml \
docs/junit/org/apache/poi/hssf/usermodel/TestBugs*
%build
@@ -134,7 +137,7 @@
xerces-j2-xml-apis \
)
export ANT_OPTS="-Xmx256m -Djava.awt.headless=true -Dbuild.sysclasspath=first
-Ddisconnected=true"
-ant -Dant.build.javac.target=1.4 -Dant.build.javac.source=1.4 jar test
+ant -Dant.build.javac.target=1.6 -Dant.build.javac.source=1.6 jar test
%install
install -dm 755 %{buildroot}%{_javadir}
@@ -159,17 +162,14 @@
%fdupes -s %{buildroot}
%files
-%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-%{version}/LICENSE
%{_javadir}/*.jar
%files javadoc
-%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}
%files manual
-%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-%{version}
%exclude %{_docdir}/%{name}-%{version}/LICENSE
++++++ poi-encoding.patch ++++++
--- build.xml 2017-09-18 16:34:04.709182154 +0200
+++ build.xml 2017-09-18 16:39:09.690366238 +0200
@@ -186,10 +186,10 @@
<copy todir="${main.output.dir}">
<fileset dir="${main.resource1.dir}"/>
</copy>
- <javac srcdir="${main.src}" destdir="${main.output.dir}" debug="on">
+ <javac srcdir="${main.src}" destdir="${main.output.dir}" debug="on"
encoding="ISO-8859-1">
<classpath refid="main.classpath"/>
</javac>
- <javac srcdir="${main.src.test}" destdir="${main.output.test.dir}"
debug="on">
+ <javac srcdir="${main.src.test}" destdir="${main.output.test.dir}"
debug="on" encoding="ISO-8859-1">
<classpath>
<path refid="main.classpath"/>
<pathelement location="${main.output.dir}"/>
@@ -199,10 +199,10 @@
</target>
<target name="compile-scratchpad" depends="init">
- <javac srcdir="${scratchpad.src}" destdir="${scratchpad.output.dir}"
debug="on">
+ <javac srcdir="${scratchpad.src}" destdir="${scratchpad.output.dir}"
debug="on" encoding="ISO-8859-1">
<classpath refid="scratchpad.classpath"/>
</javac>
- <javac srcdir="${scratchpad.src.test}"
destdir="${scratchpad.output.test.dir}" debug="on">
+ <javac srcdir="${scratchpad.src.test}"
destdir="${scratchpad.output.test.dir}" debug="on" encoding="ISO-8859-1">
<classpath>
<path refid="scratchpad.classpath"/>
<pathelement location="${scratchpad.output.dir}"/>
@@ -212,10 +212,10 @@
</target>
<target name="compile-contrib" depends="init">
- <javac srcdir="${contrib.src}" destdir="${contrib.output.dir}"
debug="on">
+ <javac srcdir="${contrib.src}" destdir="${contrib.output.dir}"
debug="on" encoding="ISO-8859-1">
<classpath refid="contrib.classpath"/>
</javac>
- <javac srcdir="${contrib.src.test}"
destdir="${contrib.output.test.dir}" debug="on">
+ <javac srcdir="${contrib.src.test}"
destdir="${contrib.output.test.dir}" debug="on" encoding="ISO-8859-1">
<classpath>
<path refid="contrib.classpath"/>
<pathelement location="${contrib.output.dir}"/>
@@ -481,6 +481,7 @@
<javadoc
destdir="${apidocs.report.dir}"
author="true"
+ encoding="ISO-8859-1"
version="true"
use="true"
verbose="false"
