Hello community,
here is the log from the commit of package saxon8 for openSUSE:Factory checked
in at 2017-09-20 17:09:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/saxon8 (Old)
and /work/SRC/openSUSE:Factory/.saxon8.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "saxon8"
Wed Sep 20 17:09:36 2017 rev:18 rq:527102 version:B.8.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/saxon8/saxon8.changes 2017-05-31
13:31:19.898918339 +0200
+++ /work/SRC/openSUSE:Factory/.saxon8.new/saxon8.changes 2017-09-20
17:09:36.787551102 +0200
@@ -1,0 +2,6 @@
+Mon Sep 18 18:02:12 UTC 2017 - fst...@suse.com
+
+- Specify encoding ISO-8859-1 and java source and target 1.6 in
+ order to fix build with jdk9
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ saxon8.spec ++++++
--- /var/tmp/diff_new_pack.GkOYjK/_old 2017-09-20 17:09:37.499450888 +0200
+++ /var/tmp/diff_new_pack.GkOYjK/_new 2017-09-20 17:09:37.503450325 +0200
@@ -32,6 +32,7 @@
Source5: %{name}q.1
BuildRequires: ant
BuildRequires: bea-stax-api
+BuildRequires: fdupes
BuildRequires: java-devel
BuildRequires: javapackages-tools
BuildRequires: jdom >= 1.0-0.b7
@@ -43,7 +44,6 @@
Requires: bea-stax-api
Requires: jaxp_parser_impl
Provides: jaxp_transform_impl
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -172,7 +172,7 @@
ant \
-Dj2se.javadoc=%{_javadocdir}/java \
-Djdom.javadoc=%{_javadocdir}/jdom \
- -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4
+ -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6
%install
# jars
@@ -187,9 +187,11 @@
# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr build/api/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
# demo
mkdir -p %{buildroot}%{_datadir}/%{name}
cp -pr samples/* %{buildroot}%{_datadir}/%{name}
+%fdupes -s %{buildroot}%{_datadir}/%{name}
# scripts
mkdir -p %{buildroot}%{_bindir}
sed 's,__RESOLVERDIR__,%{resolverdir},' < %{SOURCE1} \
@@ -215,42 +217,33 @@
fi
%files
-%defattr(0644,root,root,0755)
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/jaxp_transform_impl.jar
%ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar
%files xpath
-%defattr(0644,root,root,0755)
%{_javadir}/%{name}-xpath*
%files xom
-%defattr(0644,root,root,0755)
%{_javadir}/%{name}-xom*
%files sql
-%defattr(0644,root,root,0755)
%{_javadir}/%{name}-sql*
%files jdom
-%defattr(0644,root,root,0755)
%{_javadir}/%{name}-jdom*
%files dom
-%defattr(0644,root,root,0755)
%{_javadir}/%{name}-dom*
%files manual
-%defattr(0644,root,root,0755)
%doc doc/*.html
%files javadoc
-%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}
%files demo
-%defattr(0644,root,root,0755)
%{_datadir}/%{name}
%files scripts
++++++ saxon8.build.script ++++++
--- /var/tmp/diff_new_pack.GkOYjK/_old 2017-09-20 17:09:37.559442443 +0200
+++ /var/tmp/diff_new_pack.GkOYjK/_new 2017-09-20 17:09:37.559442443 +0200
@@ -36,7 +36,7 @@
<!-- Build classes -->
<target name="classes" depends="prepare">
- <javac srcdir="${src}" destdir="${build.classes}"/>
+ <javac srcdir="${src}" encoding="ISO-8859-1" destdir="${build.classes}"/>
</target>
<!-- Build jar archives -->
@@ -89,6 +89,7 @@
<javadoc sourcepath="${src}"
destdir="${build.doc}"
doctitle="${name} JavaDoc"
+ encoding="ISO-8859-1"
windowtitle="${name} JavaDoc"
package="true"
author="true"
