Hello community, here is the log from the commit of package ant for openSUSE:Factory checked in at 2019-10-03 16:15:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ant (Old) and /work/SRC/openSUSE:Factory/.ant.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ant" Thu Oct 3 16:15:10 2019 rev:79 rq:734252 version:1.10.5 Changes: -------- --- /work/SRC/openSUSE:Factory/ant/ant-antlr.changes 2019-04-12 09:11:25.497593497 +0200 +++ /work/SRC/openSUSE:Factory/.ant.new.2352/ant-antlr.changes 2019-10-03 16:15:12.368923787 +0200 @@ -1,0 +2,11 @@ +Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <[email protected]> + +- Build against the new compatibility packages log4j12/log4j12-mini + +------------------------------------------------------------------- +Mon Sep 30 08:08:49 UTC 2019 - Fridrich Strba <[email protected]> + +- Remove references to parent poms from all artifacts and do not + distribute the ant-parent, since we don't need it + +------------------------------------------------------------------- ant-junit.changes: same change ant-junit5.changes: same change ant.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ant-antlr.spec ++++++ --- /var/tmp/diff_new_pack.25LQN7/_old 2019-10-03 16:15:13.688920423 +0200 +++ /var/tmp/diff_new_pack.25LQN7/_new 2019-10-03 16:15:13.692920413 +0200 @@ -230,8 +230,8 @@ Summary: Optional apache log4j tasks for ant License: Apache-2.0 Group: Development/Tools/Building -BuildRequires: log4j-mini -Requires: log4j +BuildRequires: log4j12-mini +Requires: log4j12 %requires_eq ant Provides: ant-jakarta-log4j = %{version} Obsoletes: ant-jakarta-log4j < %{version} @@ -380,7 +380,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-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver +build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver %endif # Fix file-not-utf8 rpmlint warning @@ -483,6 +483,9 @@ fi #install pom + if [ "$jarname" != ant-bootstrap ]; then + %pom_remove_parent src/etc/poms/${jarname}/pom.xml + fi 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 @@ -498,9 +501,6 @@ done %if %{with bootstrap} -#ant-parent pom -install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom -%add_maven_depmap JPP-ant-parent.pom # scripts: remove dos and os/2 scripts rm -f src/script/*.bat @@ -553,7 +553,7 @@ 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 -echo "log4j ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j +echo "log4j12/log4j-12 ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2 ant-junit.spec: same change ant-junit5.spec: same change ++++++ ant.spec ++++++ --- /var/tmp/diff_new_pack.25LQN7/_old 2019-10-03 16:15:13.736920301 +0200 +++ /var/tmp/diff_new_pack.25LQN7/_new 2019-10-03 16:15:13.740920290 +0200 @@ -229,8 +229,8 @@ Summary: Optional apache log4j tasks for ant License: Apache-2.0 Group: Development/Tools/Building -BuildRequires: log4j-mini -Requires: log4j +BuildRequires: log4j12-mini +Requires: log4j12 %requires_eq ant Provides: ant-jakarta-log4j = %{version} Obsoletes: ant-jakarta-log4j < %{version} @@ -379,7 +379,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-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver +build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver %endif # Fix file-not-utf8 rpmlint warning @@ -482,6 +482,9 @@ fi #install pom + if [ "$jarname" != ant-bootstrap ]; then + %pom_remove_parent src/etc/poms/${jarname}/pom.xml + fi 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 @@ -497,9 +500,6 @@ done %if %{with bootstrap} -#ant-parent pom -install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom -%add_maven_depmap JPP-ant-parent.pom # scripts: remove dos and os/2 scripts rm -f src/script/*.bat @@ -552,7 +552,7 @@ 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 -echo "log4j ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j +echo "log4j12/log4j-12 ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2
