Hello community, here is the log from the commit of package ant for openSUSE:Factory checked in at 2017-06-10 18:32:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ant (Old) and /work/SRC/openSUSE:Factory/.ant.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ant" Sat Jun 10 18:32:40 2017 rev:61 rq:502516 version:1.9.9 Changes: -------- --- /work/SRC/openSUSE:Factory/ant/ant-antlr.changes 2017-05-31 13:31:07.716635490 +0200 +++ /work/SRC/openSUSE:Factory/.ant.new/ant-antlr.changes 2017-06-10 18:32:40.794584976 +0200 @@ -1,0 +2,11 @@ +Fri Jun 9 09:05:31 UTC 2017 - [email protected] + +- Do not generate poms on ant core packages to reduce deps and + allow bootstrap + +------------------------------------------------------------------- +Wed May 31 13:35:49 UTC 2017 - [email protected] + +- Fix bootstrap to avoid new cycle bsc#1041966 + +------------------------------------------------------------------- ant-junit.changes: same change --- /work/SRC/openSUSE:Factory/ant/ant.changes 2017-06-04 01:47:54.237288470 +0200 +++ /work/SRC/openSUSE:Factory/.ant.new/ant.changes 2017-06-10 18:32:41.114539736 +0200 @@ -1,0 +2,6 @@ +Fri Jun 9 09:05:31 UTC 2017 - [email protected] + +- Do not generate poms on ant core packages to reduce deps and + allow bootstrap + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ant-antlr.spec ++++++ --- /var/tmp/diff_new_pack.h9UzUu/_old 2017-06-10 18:32:42.122397233 +0200 +++ /var/tmp/diff_new_pack.h9UzUu/_new 2017-06-10 18:32:42.126396667 +0200 @@ -45,15 +45,19 @@ Patch3: reproducible.patch %if %{with bootstrap} BuildRequires: java-1_5_0-gcj-compat-devel -#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel -#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel +#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless +#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel java-1_7_0-openjdk-headless +#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel java-1_8_0-openjdk-headless +#!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless %else BuildRequires: java-devel >= 1.5.0 %endif BuildRequires: antlr-bootstrap BuildRequires: javapackages-tools # Needed for maven conversions +%if !%{with bootstrap} BuildRequires: javapackages-local +%endif BuildRequires: unzip #BuildRequires: xerces-j2-bootstrap #!BuildIgnore: xerces-j2-bootstrap @@ -457,15 +461,17 @@ [ $jarname == ant-bootstrap ] && continue #install pom +%if !%{with bootstrap} install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" %add_maven_depmap ${pomname} ${destname}${jarname}.jar +%endif 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 +#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 @@ -566,15 +572,15 @@ %{ant_home}/lib/ant-bootstrap.jar %{ant_home}/lib/ant-launcher.jar %dir %{_sysconfdir}/ant.d -%{_mavenpomdir}/JPP-ant-launcher.pom -%{_mavenpomdir}/JPP-ant-parent.pom -%{_mavenpomdir}/JPP-ant.pom -%if %{?suse_version} > 1320 -%{_datadir}/maven-metadata/ant.xml -%else -%config(noreplace) %{_mavendepmapfragdir}/ant -%endif -%dir %{_mavenpomdir} +#%{_mavenpomdir}/JPP-ant-launcher.pom +#%{_mavenpomdir}/JPP-ant-parent.pom +#%{_mavenpomdir}/JPP-ant.pom +#%if %{?suse_version} > 1320 +#%{_datadir}/maven-metadata/ant.xml +#%else +#%config(noreplace) %{_mavendepmapfragdir}/ant +#%endif +#%dir %{_mavenpomdir} %endif %if %{with antlr} @@ -618,15 +624,15 @@ %{_javadir}/ant/ant-jmf.jar %{ant_home}/lib/ant-jmf.jar %config(noreplace) %{_sysconfdir}/ant.d/jmf -%{_mavenpomdir}/JPP.ant-ant-jmf.pom +#%{_mavenpomdir}/JPP.ant-ant-jmf.pom %files -n ant-swing %defattr(0644,root,root,0755) %{_javadir}/ant/ant-swing.jar %{ant_home}/lib/ant-swing.jar %config(noreplace) %{_sysconfdir}/ant.d/swing -%{_mavenpomdir}/JPP.ant-ant-swing.pom -%dir %{_mavenpomdir} +#%{_mavenpomdir}/JPP.ant-ant-swing.pom +#%dir %{_mavenpomdir} %files -n ant-scripts %defattr(0755,root,root,0755) ant-junit.spec: same change ++++++ ant.spec ++++++ --- /var/tmp/diff_new_pack.h9UzUu/_old 2017-06-10 18:32:42.174389881 +0200 +++ /var/tmp/diff_new_pack.h9UzUu/_new 2017-06-10 18:32:42.178389316 +0200 @@ -54,7 +54,9 @@ BuildRequires: antlr-bootstrap BuildRequires: javapackages-tools # Needed for maven conversions +%if !%{with bootstrap} BuildRequires: javapackages-local +%endif BuildRequires: unzip #BuildRequires: xerces-j2-bootstrap #!BuildIgnore: xerces-j2-bootstrap @@ -458,15 +460,17 @@ [ $jarname == ant-bootstrap ] && continue #install pom +%if !%{with bootstrap} install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" %add_maven_depmap ${pomname} ${destname}${jarname}.jar +%endif 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 +#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 @@ -567,15 +571,15 @@ %{ant_home}/lib/ant-bootstrap.jar %{ant_home}/lib/ant-launcher.jar %dir %{_sysconfdir}/ant.d -%{_mavenpomdir}/JPP-ant-launcher.pom -%{_mavenpomdir}/JPP-ant-parent.pom -%{_mavenpomdir}/JPP-ant.pom -%if %{?suse_version} > 1320 -%{_datadir}/maven-metadata/ant.xml -%else -%config(noreplace) %{_mavendepmapfragdir}/ant -%endif -%dir %{_mavenpomdir} +#%{_mavenpomdir}/JPP-ant-launcher.pom +#%{_mavenpomdir}/JPP-ant-parent.pom +#%{_mavenpomdir}/JPP-ant.pom +#%if %{?suse_version} > 1320 +#%{_datadir}/maven-metadata/ant.xml +#%else +#%config(noreplace) %{_mavendepmapfragdir}/ant +#%endif +#%dir %{_mavenpomdir} %endif %if %{with antlr} @@ -619,15 +623,15 @@ %{_javadir}/ant/ant-jmf.jar %{ant_home}/lib/ant-jmf.jar %config(noreplace) %{_sysconfdir}/ant.d/jmf -%{_mavenpomdir}/JPP.ant-ant-jmf.pom +#%{_mavenpomdir}/JPP.ant-ant-jmf.pom %files -n ant-swing %defattr(0644,root,root,0755) %{_javadir}/ant/ant-swing.jar %{ant_home}/lib/ant-swing.jar %config(noreplace) %{_sysconfdir}/ant.d/swing -%{_mavenpomdir}/JPP.ant-ant-swing.pom -%dir %{_mavenpomdir} +#%{_mavenpomdir}/JPP.ant-ant-swing.pom +#%dir %{_mavenpomdir} %files -n ant-scripts %defattr(0755,root,root,0755)
