Hello community,
here is the log from the commit of package xml-commons for openSUSE:Factory
checked in at 2017-10-10 11:39:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xml-commons (Old)
and /work/SRC/openSUSE:Factory/.xml-commons.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xml-commons"
Tue Oct 10 11:39:02 2017 rev:40 rq:531457 version:1.4.01
Changes:
--------
--- /work/SRC/openSUSE:Factory/xml-commons/xml-commons-apis-bootstrap.changes
2017-09-17 22:36:11.198725165 +0200
+++
/work/SRC/openSUSE:Factory/.xml-commons.new/xml-commons-apis-bootstrap.changes
2017-10-10 11:39:07.429644455 +0200
@@ -1,0 +2,8 @@
+Wed Oct 4 19:43:23 UTC 2017 - [email protected]
+
+- Don't depend on java-1_5_0-gcj-compat
+- Depend on java-devel >= 1.6 instead
+- Don't build the javax.xml.parsers.* and javax.xml.transformers.*
+ classes, since they are part of jdk6+
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/xml-commons/xml-commons.changes 2017-05-31
13:30:30.193924474 +0200
+++ /work/SRC/openSUSE:Factory/.xml-commons.new/xml-commons.changes
2017-10-10 11:39:08.849582135 +0200
@@ -1,0 +2,10 @@
+Wed Oct 4 19:55:32 UTC 2017 - [email protected]
+
+- Don't depend on java-1_5_0-gcj-compat
+- Depend on java-devel >= 1.6 instead
+- Added patch:
+ * xml-commons-encoding.patch
+ + Specify file encoding UTF-8 to avoid build breakages with
+ jdk9
+
+-------------------------------------------------------------------
New:
----
xml-commons-encoding.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xml-commons-apis-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.2zTlTe/_old 2017-10-10 11:39:09.917535262 +0200
+++ /var/tmp/diff_new_pack.2zTlTe/_new 2017-10-10 11:39:09.921535086 +0200
@@ -36,13 +36,12 @@
Patch1: %{real_name}-resolver-crosslink.patch
Patch2: %{real_name}-resolver-1.1-build_xml.patch
Patch3: %{real_name}-enum.patch
-#!BuildIgnore: antlr antlr-java
BuildRequires: antlr-bootstrap
-#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
-BuildRequires: fastjar
-BuildRequires: java-1_5_0-gcj-compat-devel
+BuildRequires: java-devel >= 1.6
# Needed for maven conversions
BuildRequires: javapackages-local
+#!BuildIgnore: antlr
+#!BuildIgnore: antlr-java
Provides: xml-apis
BuildArch: noarch
@@ -131,8 +130,8 @@
# PARAM#1: name of jar archive (without .jar suffix)
# uses $TARGET_DIR to move created jar to
function mkJar() {
- find -name "version.txt" -or -name "*.class" -or -name "*.properties" -or
-name "*.rsc" -or -name "*manifest*" |\
- xargs %{_bindir}/fastjar -m manifest.* -cf ${1}.jar ;
+ find -name "version.txt" -or -name "*.class" -or -name "*.properties" -or
-name "*.rsc" |\
+ xargs jar cfm ${1}.jar manifest.* ;
mv ${1}.jar $TARGET_DIR
}
#<<<
@@ -140,10 +139,9 @@
#<<< end functions
# variables:
-COMPILER_COMMAND="javac -source 1.5 -target 1.5 -classpath "
+COMPILER_COMMAND="javac -source 1.6 -target 1.6 -classpath "
TARGET_DIR=`pwd`
CLASSPATH_ORIG="$CLASSPATH"
-LIB_GCJ="`ls %{_javadir}/libgcj-*.jar`"
delBinaryFiles
#>>> xml-apis and xml-which
@@ -151,6 +149,9 @@
pushd xml-commons-1_0_b2
cd java/external/src
+# These are java internal
+# classes since 1.6
+rm -rf javax/xml
mkTargetClasspath
compileFiles
mkJar %{apis_jar}
@@ -189,17 +190,14 @@
#<<< install end
%files
-%defattr(-,root,root)
%doc xml-commons-1_0_b2/LICENSE.txt
%{_javadir}/%{apis_jar}.jar
%files -n xml-commons-which-bootstrap
-%defattr(-,root,root)
%doc xml-commons-1_0_b2/LICENSE.txt
%{_javadir}/%{which_jar}.jar
%files -n xml-commons-resolver-bootstrap
-%defattr(-,root,root)
%doc xml-commons-1_0_b2/LICENSE.txt
%{_javadir}/%{resolver_jar}.jar
#<<<
++++++ xml-commons.spec ++++++
--- /var/tmp/diff_new_pack.2zTlTe/_old 2017-10-10 11:39:10.013531049 +0200
+++ /var/tmp/diff_new_pack.2zTlTe/_new 2017-10-10 11:39:10.017530873 +0200
@@ -79,16 +79,18 @@
Patch3: %{name}-enum.patch
#PATCH-FIX-SUSE: don't call javadoc from any used target
Patch4: xml-commons-no-javadoc.patch
+Patch5: xml-commons-encoding.patch
BuildRequires: ant
-BuildRequires: java-1_5_0-gcj-compat-devel
+BuildRequires: java-devel >= 1.6
# Needed for maven conversions
BuildRequires: javapackages-local
-#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
-#BuildRequires: docbook-style-xsl
BuildRequires: javapackages-tools
BuildRequires: xalan-j2
-#!BuildIgnore: xml-commons-resolver xml-commons-jaxp-1.3-apis xml-commons
-#!BuildIgnore: antlr antlr-java
+#!BuildIgnore: antlr
+#!BuildIgnore: antlr-java
+#!BuildIgnore: xml-commons
+#!BuildIgnore: xml-commons-jaxp-1.3-apis
+#!BuildIgnore: xml-commons-resolver
BuildArch: noarch
%description
@@ -313,6 +315,8 @@
%patch4 -p1
+%patch5 -p1
+
# remove all binary libs and prebuilt javadocs
rm -rf `find . -name "*.jar" -o -name "*.gz"`
rm -rf java/build java/external/build/docs/javadoc
@@ -327,7 +331,7 @@
cp tempf src/manifest.resolver
rm tempf
popd
-ant jars
+ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jars
popd
pushd xml-commons-resolver-1_1_b1
mkdir -p build/site/components/resolver
@@ -338,20 +342,20 @@
cp tempf src/manifest.resolver
rm tempf
popd
-ant jars
+ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jars
popd
pushd xml-commons-resolver-1_2
-ant -f java/resolver.xml jar
-ant -f java/which.xml jar
+ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -f
java/resolver.xml jar
+ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -f
java/which.xml jar
popd
pushd xml-commons-external-1_2_*
-ant -f java/external/build.xml jar
+ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -f
java/external/build.xml jar
popd
pushd xml-commons-external-1_3_*
-ant -f java/external/build.xml jar
+ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -f
java/external/build.xml jar
popd
pushd xml-commons-external-1_4_*
-ant -f java/external/build.xml jar
+ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -f
java/external/build.xml jar
popd
%install
@@ -716,7 +720,6 @@
# -----------------------------------------------------------------------------
%files
-%defattr(0644,root,root,0755)
%doc xml-commons-1_0_b2/LICENSE.txt
%doc xml-commons-external-1_4_*/java/external/*.txt
%config(noreplace) %{resolverdir}/*
@@ -724,7 +727,6 @@
%dir %{_sysconfdir}/java/resolver
%files jaxp-1.1-apis
-%defattr(0644,root,root,0755)
# FIXME:
# xml-commons-jaxp-1.1-apis.noarch: W: file-not-utf8
/usr/share/xml-commons-jaxp-1.1-apis-1.3.03/LICENSE.dom-software.txt
# xml-commons-jaxp-1.1-apis.noarch: W: file-not-utf8
/usr/share/xml-commons-jaxp-1.1-apis-1.3.03/LICENSE.dom-documentation.txt
@@ -748,11 +750,9 @@
%ghost %{_sysconfdir}/alternatives/xslt.jar
%files jaxp-1.1-apis-manual
-%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-jaxp-1.1-apis-%{version}
%files which10
-%defattr(0644,root,root,0755)
%{_javadir}/%{name}-which10*.jar
%{_javadir}/xml-commons-which.jar
%ghost %{_sysconfdir}/alternatives/xml-commons-which.jar
@@ -761,7 +761,6 @@
%ghost %{_sysconfdir}/alternatives/xml-which
%files resolver10
-%defattr(0644,root,root,0755)
%{_javadir}/%{name}-resolver10*.jar
%{_javadir}/xml-commons-resolver.jar
%ghost %{_sysconfdir}/alternatives/xml-commons-resolver.jar
@@ -785,7 +784,6 @@
%ghost %{_sysconfdir}/alternatives/xml-xparse.1.gz
%files resolver11
-%defattr(0644,root,root,0755)
%{_javadir}/%{name}-resolver11*.jar
%{_javadir}/xml-commons-resolver.jar
%ghost %{_sysconfdir}/alternatives/xml-commons-resolver.jar
@@ -809,7 +807,6 @@
%ghost %{_sysconfdir}/alternatives/xml-xparse.1.gz
%files jaxp-1.2-apis
-%defattr(0644,root,root,0755)
%doc %{_datadir}/%{name}-jaxp-1.2-apis-%{version}
%{_javadir}/%{name}-jaxp-1.2-apis*.jar
%{_javadir}/xml-commons-apis.jar
@@ -830,11 +827,9 @@
%ghost %{_sysconfdir}/alternatives/xslt.jar
%files jaxp-1.2-apis-manual
-%defattr(0644,root,root,0755)
%{_docdir}/%{name}-jaxp-1.2-apis-%{version}
%files jaxp-1.3-apis
-%defattr(0644,root,root,0755)
%doc %{_datadir}/%{name}-jaxp-1.3-apis-%{version}
%{_javadir}/%{name}-jaxp-1.3-apis-%{version}.jar
%{_javadir}/%{name}-jaxp-1.3-apis.jar
@@ -861,11 +856,9 @@
%ghost %{_sysconfdir}/alternatives/xslt.jar
%files jaxp-1.3-apis-manual
-%defattr(0644,root,root,0755)
%{_docdir}/%{name}-jaxp-1.3-apis-%{version}
%files which11
-%defattr(0644,root,root,0755)
%{_javadir}/%{name}-which11*.jar
%{_javadir}/xml-commons-which.jar
%ghost %{_sysconfdir}/alternatives/xml-commons-which.jar
@@ -874,7 +867,6 @@
%ghost %{_sysconfdir}/alternatives/xml-which
%files resolver12
-%defattr(0644,root,root,0755)
%{_javadir}/%{name}-resolver12*.jar
%{_mavenpomdir}/JPP-%{name}-resolver12.pom
%{_javadir}/xml-commons-resolver.jar
@@ -899,7 +891,6 @@
%ghost %{_sysconfdir}/alternatives/xml-xparse.1.gz
%files jaxp-1.4-apis
-%defattr(0644,root,root,0755)
%doc %{_datadir}/%{name}-jaxp-1.4-apis-%{version}
%{_javadir}/%{name}-jaxp-1.4-apis-%{version}.jar
%{_javadir}/%{name}-jaxp-1.4-apis.jar
@@ -924,12 +915,10 @@
%ghost %{_sysconfdir}/alternatives/xslt.jar
%files jaxp-1.4-apis-manual
-%defattr(0644,root,root,0755)
%{_docdir}/%{name}-jaxp-1.4-apis-%{version}
%if %{with_repolib}
%files repolib
-%defattr(0644,root,root,0755)
%{repodir}
%endif
++++++ xml-commons-encoding.patch ++++++
--- xml-commons-1.4.01/xml-commons-external-1_3_05/java/external/build.xml
2017-10-04 21:48:12.614748719 +0200
+++ xml-commons-1.4.01/xml-commons-external-1_3_05/java/external/build.xml
2017-10-04 21:49:20.994748978 +0200
@@ -103,7 +103,7 @@
<target name="compile" depends="prepare"
description="Compile all classes">
<javac srcdir="${src.dir}" destdir="${build.classes.dir}"
- debug="${debug}" />
+ debug="${debug}" encoding="UTF-8" />
</target>
<target name="jar" depends="compile"
--- xml-commons-1.4.01/xml-commons-external-1_4_01/java/external/build.xml
2017-10-04 21:48:12.666748720 +0200
+++ xml-commons-1.4.01/xml-commons-external-1_4_01/java/external/build.xml
2017-10-04 21:52:22.566291530 +0200
@@ -103,7 +103,7 @@
<target name="compile" depends="prepare"
description="Compile all classes">
<javac srcdir="${src.dir}" destdir="${build.classes.dir}"
- debug="${debug}" />
+ debug="${debug}" encoding="UTF-8" />
</target>
<target name="jar" depends="compile"
