Hello community,
here is the log from the commit of package ant for openSUSE:Factory checked in
at 2018-12-14 20:44:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ant (Old)
and /work/SRC/openSUSE:Factory/.ant.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ant"
Fri Dec 14 20:44:16 2018 rev:73 rq:656912 version:1.10.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/ant/ant-antlr.changes 2018-12-07
14:30:00.615472414 +0100
+++ /work/SRC/openSUSE:Factory/.ant.new.28833/ant-antlr.changes 2018-12-14
20:44:19.097763616 +0100
@@ -1,0 +2,11 @@
+Mon Dec 10 08:22:18 UTC 2018 - Fridrich Strba <fst...@suse.com>
+
+- Don't build against a particular xml-apis/xml-resolver provider,
+ but against the generic virtual provider. This allows easier
+ bootstrapping.
+- Added patch:
+ * apache-ant-xml-apis.patch
+ + look for the xml-apis.jar and xml-resolver.jar when composing
+ classpath; they are symlinks provided by several packages.
+
+-------------------------------------------------------------------
ant-junit.changes: same change
ant.changes: same change
New:
----
apache-ant-xml-apis.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ant-antlr.spec ++++++
--- /var/tmp/diff_new_pack.mje25j/_old 2018-12-14 20:44:21.885759760 +0100
+++ /var/tmp/diff_new_pack.mje25j/_new 2018-12-14 20:44:21.889759754 +0100
@@ -43,14 +43,12 @@
Patch4: ant-python3.patch
# PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- have fixed
"Created-by" in manifest
Patch5: reproducible-build-manifest.patch
+Patch6: apache-ant-xml-apis.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
-BuildRequires: javapackages-tools
BuildRequires: unzip
-BuildRequires: xml-commons-apis-bootstrap
-#BuildRequires: xerces-j2-bootstrap
-#!BuildIgnore: xerces-j2-bootstrap
+BuildRequires: xml-apis
BuildArch: noarch
# Needed for maven conversions
%if !%{with bootstrap}
@@ -63,7 +61,7 @@
%endif
%if %{with antlr}
BuildRequires: xerces-j2
-BuildRequires: xml-commons-apis
+BuildRequires: xml-apis
%endif
%if 0%{?suse_version} > 1320
BuildRequires: strip-nondeterminism
@@ -72,8 +70,8 @@
Requires: java-devel >= 1.8
Requires: javapackages-tools
Requires: jaxp_parser_impl
-Requires: xml-commons-apis
-Requires: xml-commons-resolver
+Requires: xml-apis
+Requires: xml-resolver
Obsoletes: apache-ant < %{version}
Provides: apache-ant = %{version}
Obsoletes: ant-nodeps < %{version}
@@ -162,8 +160,8 @@
Summary: Optional apache resolver tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
-BuildRequires: xml-commons-resolver
-Requires: xml-commons-resolver
+BuildRequires: xml-resolver
+Requires: xml-resolver
%requires_eq ant
%description -n ant-apache-resolver
@@ -344,6 +342,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
# clean jar files
find . -name "*.jar" -print -delete
@@ -362,7 +361,7 @@
%endif
%if %{with antlr}
# we need to build junit in antlr, but we remove it later
-build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis
antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf
commons-logging commons-net jsch xalan-j2 xalan-j2-serializer
xml-commons-resolver
+build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap
bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging
commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver
%endif
# Fix file-not-utf8 rpmlint warning
@@ -455,7 +454,7 @@
[ $jarname == ant-bootstrap ] && continue
#install pom
- install -m 644 src%{_sysconfdir}/poms/${jarname}/pom.xml
%{buildroot}/%{_mavenpomdir}/${pomname}
+ install -m 644 src/etc/poms/${jarname}/pom.xml
%{buildroot}/%{_mavenpomdir}/${pomname}
if [ $jarname == ant-launcher ]; then
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
elif [ $jarname == ant ]; then
@@ -475,14 +474,14 @@
rm -f src/script/*.cmd
# XSLs
-cp -p src%{_sysconfdir}/*.xsl %{buildroot}%{ant_home}%{_sysconfdir}
+cp -p src/etc/*.xsl %{buildroot}%{ant_home}%{_sysconfdir}
rm -f
%{buildroot}%{ant_home}%{_sysconfdir}/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl
%endif
%if %{with junit}
-cp -p src%{_sysconfdir}/{junit-noframes,junit-frames}.xsl
%{buildroot}%{ant_home}%{_sysconfdir}
+cp -p src/etc/{junit-noframes,junit-frames}.xsl
%{buildroot}%{ant_home}%{_sysconfdir}
%endif
%if %{with antlr}
-cp -p src%{_sysconfdir}/{maudit-frames,jdepend,jdepend-frames}.xsl
%{buildroot}%{ant_home}%{_sysconfdir}
+cp -p src/etc/{maudit-frames,jdepend,jdepend-frames}.xsl
%{buildroot}%{ant_home}%{_sysconfdir}
%endif
%if %{with bootstrap}
@@ -513,7 +512,7 @@
%if %{with antlr}
echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr
echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf
-echo "xml-commons-resolver ant/ant-apache-resolver" >
%{buildroot}%{_sysconfdir}/ant.d/apache-resolver
+echo "xml-resolver ant/ant-apache-resolver" >
%{buildroot}%{_sysconfdir}/ant.d/apache-resolver
echo "jakarta-commons-logging ant/ant-commons-logging" >
%{buildroot}%{_sysconfdir}/ant.d/commons-logging
echo "jakarta-commons-net ant/ant-commons-net" >
%{buildroot}%{_sysconfdir}/ant.d/commons-net
echo "bcel ant/ant-apache-bcel" > %{buildroot}%{_sysconfdir}/ant.d/apache-bcel
++++++ ant-junit.spec ++++++
--- /var/tmp/diff_new_pack.mje25j/_old 2018-12-14 20:44:21.901759738 +0100
+++ /var/tmp/diff_new_pack.mje25j/_new 2018-12-14 20:44:21.901759738 +0100
@@ -43,14 +43,12 @@
Patch4: ant-python3.patch
# PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- have fixed
"Created-by" in manifest
Patch5: reproducible-build-manifest.patch
+Patch6: apache-ant-xml-apis.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
-BuildRequires: javapackages-tools
BuildRequires: unzip
-BuildRequires: xml-commons-apis-bootstrap
-#BuildRequires: xerces-j2-bootstrap
-#!BuildIgnore: xerces-j2-bootstrap
+BuildRequires: xml-apis
BuildArch: noarch
# Needed for maven conversions
%if !%{with bootstrap}
@@ -63,7 +61,7 @@
%endif
%if %{with antlr}
BuildRequires: xerces-j2
-BuildRequires: xml-commons-apis
+BuildRequires: xml-apis
%endif
%if 0%{?suse_version} > 1320
BuildRequires: strip-nondeterminism
@@ -72,8 +70,8 @@
Requires: java-devel >= 1.8
Requires: javapackages-tools
Requires: jaxp_parser_impl
-Requires: xml-commons-apis
-Requires: xml-commons-resolver
+Requires: xml-apis
+Requires: xml-resolver
Obsoletes: apache-ant < %{version}
Provides: apache-ant = %{version}
Obsoletes: ant-nodeps < %{version}
@@ -162,8 +160,8 @@
Summary: Optional apache resolver tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
-BuildRequires: xml-commons-resolver
-Requires: xml-commons-resolver
+BuildRequires: xml-resolver
+Requires: xml-resolver
%requires_eq ant
%description -n ant-apache-resolver
@@ -344,6 +342,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
# clean jar files
find . -name "*.jar" -print -delete
@@ -362,7 +361,7 @@
%endif
%if %{with antlr}
# we need to build junit in antlr, but we remove it later
-build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis
antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf
commons-logging commons-net jsch xalan-j2 xalan-j2-serializer
xml-commons-resolver
+build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap
bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging
commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver
%endif
# Fix file-not-utf8 rpmlint warning
@@ -455,7 +454,7 @@
[ $jarname == ant-bootstrap ] && continue
#install pom
- install -m 644 src%{_sysconfdir}/poms/${jarname}/pom.xml
%{buildroot}/%{_mavenpomdir}/${pomname}
+ install -m 644 src/etc/poms/${jarname}/pom.xml
%{buildroot}/%{_mavenpomdir}/${pomname}
if [ $jarname == ant-launcher ]; then
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
elif [ $jarname == ant ]; then
@@ -475,14 +474,14 @@
rm -f src/script/*.cmd
# XSLs
-cp -p src%{_sysconfdir}/*.xsl %{buildroot}%{ant_home}%{_sysconfdir}
+cp -p src/etc/*.xsl %{buildroot}%{ant_home}%{_sysconfdir}
rm -f
%{buildroot}%{ant_home}%{_sysconfdir}/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl
%endif
%if %{with junit}
-cp -p src%{_sysconfdir}/{junit-noframes,junit-frames}.xsl
%{buildroot}%{ant_home}%{_sysconfdir}
+cp -p src/etc/{junit-noframes,junit-frames}.xsl
%{buildroot}%{ant_home}%{_sysconfdir}
%endif
%if %{with antlr}
-cp -p src%{_sysconfdir}/{maudit-frames,jdepend,jdepend-frames}.xsl
%{buildroot}%{ant_home}%{_sysconfdir}
+cp -p src/etc/{maudit-frames,jdepend,jdepend-frames}.xsl
%{buildroot}%{ant_home}%{_sysconfdir}
%endif
%if %{with bootstrap}
@@ -513,7 +512,7 @@
%if %{with antlr}
echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr
echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf
-echo "xml-commons-resolver ant/ant-apache-resolver" >
%{buildroot}%{_sysconfdir}/ant.d/apache-resolver
+echo "xml-resolver ant/ant-apache-resolver" >
%{buildroot}%{_sysconfdir}/ant.d/apache-resolver
echo "jakarta-commons-logging ant/ant-commons-logging" >
%{buildroot}%{_sysconfdir}/ant.d/commons-logging
echo "jakarta-commons-net ant/ant-commons-net" >
%{buildroot}%{_sysconfdir}/ant.d/commons-net
echo "bcel ant/ant-apache-bcel" > %{buildroot}%{_sysconfdir}/ant.d/apache-bcel
++++++ ant.spec ++++++
--- /var/tmp/diff_new_pack.mje25j/_old 2018-12-14 20:44:21.917759716 +0100
+++ /var/tmp/diff_new_pack.mje25j/_new 2018-12-14 20:44:21.917759716 +0100
@@ -42,14 +42,12 @@
Patch4: ant-python3.patch
# PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- have fixed
"Created-by" in manifest
Patch5: reproducible-build-manifest.patch
+Patch6: apache-ant-xml-apis.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
-BuildRequires: javapackages-tools
BuildRequires: unzip
-BuildRequires: xml-commons-apis-bootstrap
-#BuildRequires: xerces-j2-bootstrap
-#!BuildIgnore: xerces-j2-bootstrap
+BuildRequires: xml-apis
BuildArch: noarch
# Needed for maven conversions
%if !%{with bootstrap}
@@ -62,7 +60,7 @@
%endif
%if %{with antlr}
BuildRequires: xerces-j2
-BuildRequires: xml-commons-apis
+BuildRequires: xml-apis
%endif
%if 0%{?suse_version} > 1320
BuildRequires: strip-nondeterminism
@@ -71,8 +69,8 @@
Requires: java-devel >= 1.8
Requires: javapackages-tools
Requires: jaxp_parser_impl
-Requires: xml-commons-apis
-Requires: xml-commons-resolver
+Requires: xml-apis
+Requires: xml-resolver
Obsoletes: apache-ant < %{version}
Provides: apache-ant = %{version}
Obsoletes: ant-nodeps < %{version}
@@ -161,8 +159,8 @@
Summary: Optional apache resolver tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
-BuildRequires: xml-commons-resolver
-Requires: xml-commons-resolver
+BuildRequires: xml-resolver
+Requires: xml-resolver
%requires_eq ant
%description -n ant-apache-resolver
@@ -343,6 +341,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
# clean jar files
find . -name "*.jar" -print -delete
@@ -361,7 +360,7 @@
%endif
%if %{with antlr}
# we need to build junit in antlr, but we remove it later
-build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis
antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf
commons-logging commons-net jsch xalan-j2 xalan-j2-serializer
xml-commons-resolver
+build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap
bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging
commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver
%endif
# Fix file-not-utf8 rpmlint warning
@@ -454,7 +453,7 @@
[ $jarname == ant-bootstrap ] && continue
#install pom
- install -m 644 src%{_sysconfdir}/poms/${jarname}/pom.xml
%{buildroot}/%{_mavenpomdir}/${pomname}
+ install -m 644 src/etc/poms/${jarname}/pom.xml
%{buildroot}/%{_mavenpomdir}/${pomname}
if [ $jarname == ant-launcher ]; then
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
elif [ $jarname == ant ]; then
@@ -474,14 +473,14 @@
rm -f src/script/*.cmd
# XSLs
-cp -p src%{_sysconfdir}/*.xsl %{buildroot}%{ant_home}%{_sysconfdir}
+cp -p src/etc/*.xsl %{buildroot}%{ant_home}%{_sysconfdir}
rm -f
%{buildroot}%{ant_home}%{_sysconfdir}/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl
%endif
%if %{with junit}
-cp -p src%{_sysconfdir}/{junit-noframes,junit-frames}.xsl
%{buildroot}%{ant_home}%{_sysconfdir}
+cp -p src/etc/{junit-noframes,junit-frames}.xsl
%{buildroot}%{ant_home}%{_sysconfdir}
%endif
%if %{with antlr}
-cp -p src%{_sysconfdir}/{maudit-frames,jdepend,jdepend-frames}.xsl
%{buildroot}%{ant_home}%{_sysconfdir}
+cp -p src/etc/{maudit-frames,jdepend,jdepend-frames}.xsl
%{buildroot}%{ant_home}%{_sysconfdir}
%endif
%if %{with bootstrap}
@@ -512,7 +511,7 @@
%if %{with antlr}
echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr
echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf
-echo "xml-commons-resolver ant/ant-apache-resolver" >
%{buildroot}%{_sysconfdir}/ant.d/apache-resolver
+echo "xml-resolver ant/ant-apache-resolver" >
%{buildroot}%{_sysconfdir}/ant.d/apache-resolver
echo "jakarta-commons-logging ant/ant-commons-logging" >
%{buildroot}%{_sysconfdir}/ant.d/commons-logging
echo "jakarta-commons-net ant/ant-commons-net" >
%{buildroot}%{_sysconfdir}/ant.d/commons-net
echo "bcel ant/ant-apache-bcel" > %{buildroot}%{_sysconfdir}/ant.d/apache-bcel
++++++ apache-ant-xml-apis.patch ++++++
--- apache-ant-1.10.5/src/script/ant 2018-07-10 06:50:31.000000000 +0200
+++ apache-ant-1.10.5/src/script/ant 2018-12-10 09:12:59.451126724 +0100
@@ -206,7 +206,7 @@
# request optional jars and their dependencies via the OPT_JAR_LIST
# variable
if $rpm_mode && [ -x /usr/bin/build-classpath ]; then
- LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl
xml-commons-apis)"
+ LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl
xml-apis)"
# If no optional jars have been specified then build the default list
if [ -z "$OPT_JAR_LIST" ]; then
