rpm/ant
SHA256
1
0
Fork 0
forked from pool/ant
Code Pull Requests Activity

- Do not generate poms on ant core packages to reduce deps and

Browse Source 
allow bootstrap

- Fix bootstrap to avoid new cycle bsc#1041966

- Do not generate poms on ant core packages to reduce deps and
  allow bootstrap

- Fix bootstrap to avoid new cycle bsc#1041966

- Do not generate poms on ant core packages to reduce deps and
  allow bootstrap

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=85
This commit is contained in:
Tomáš Chvátal 2017-06-09 09:04:32 +00:00 committed by Git OBS Bridge
parent 2690400180
commit cc2f5a0813
6 changed files with 90 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ant-antlr.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Jun 9 09:05:31 UTC 2017 - tchvatal@suse.com
- Do not generate poms on ant core packages to reduce deps and
allow bootstrap
-------------------------------------------------------------------
Wed May 31 13:35:49 UTC 2017 - tchvatal@suse.com
- Fix bootstrap to avoid new cycle bsc#1041966
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 19 08:08:28 UTC 2017 - tchvatal@suse.com Fri May 19 08:08:28 UTC 2017 - tchvatal@suse.com

38
ant-antlr.spec
View File

@ -45,15 +45,19 @@ Patch1: apache-ant-class-path-in-manifest.patch
Patch3: reproducible.patch Patch3: reproducible.patch
%if %{with bootstrap} %if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel BuildRequires: java-1_5_0-gcj-compat-devel
#!BuildIgnore: java-1_6_0-openjdk java-1_6_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 #!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 %else
BuildRequires: java-devel >= 1.5.0 BuildRequires: java-devel >= 1.5.0
%endif %endif
BuildRequires: antlr-bootstrap BuildRequires: antlr-bootstrap
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
# Needed for maven conversions # Needed for maven conversions
%if !%{with bootstrap}
BuildRequires: javapackages-local BuildRequires: javapackages-local
%endif
BuildRequires: unzip BuildRequires: unzip
#BuildRequires: xerces-j2-bootstrap #BuildRequires: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2-bootstrap #!BuildIgnore: xerces-j2-bootstrap
@ -457,15 +461,17 @@ do
[ $jarname == ant-bootstrap ] && continue [ $jarname == ant-bootstrap ] && continue
#install pom #install pom
%if !%{with bootstrap}
install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar"
%add_maven_depmap ${pomname} ${destname}${jarname}.jar %add_maven_depmap ${pomname} ${destname}${jarname}.jar
%endif
done done
%if %{with bootstrap} %if %{with bootstrap}
#ant-parent pom #ant-parent pom
install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/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 #%add_maven_depmap JPP-ant-parent.pom
# scripts: remove dos and os/2 scripts # scripts: remove dos and os/2 scripts
rm -f src/script/*.bat rm -f src/script/*.bat
@ -566,15 +572,15 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%{ant_home}/lib/ant-bootstrap.jar %{ant_home}/lib/ant-bootstrap.jar
%{ant_home}/lib/ant-launcher.jar %{ant_home}/lib/ant-launcher.jar
%dir %{_sysconfdir}/ant.d %dir %{_sysconfdir}/ant.d
%{_mavenpomdir}/JPP-ant-launcher.pom #%{_mavenpomdir}/JPP-ant-launcher.pom
%{_mavenpomdir}/JPP-ant-parent.pom #%{_mavenpomdir}/JPP-ant-parent.pom
%{_mavenpomdir}/JPP-ant.pom #%{_mavenpomdir}/JPP-ant.pom
%if %{?suse_version} > 1320 #%if %{?suse_version} > 1320
%{_datadir}/maven-metadata/ant.xml #%{_datadir}/maven-metadata/ant.xml
%else #%else
%config(noreplace) %{_mavendepmapfragdir}/ant #%config(noreplace) %{_mavendepmapfragdir}/ant
%endif #%endif
%dir %{_mavenpomdir} #%dir %{_mavenpomdir}
%endif %endif
%if %{with antlr} %if %{with antlr}
@ -618,15 +624,15 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%{_javadir}/ant/ant-jmf.jar %{_javadir}/ant/ant-jmf.jar
%{ant_home}/lib/ant-jmf.jar %{ant_home}/lib/ant-jmf.jar
%config(noreplace) %{_sysconfdir}/ant.d/jmf %config(noreplace) %{_sysconfdir}/ant.d/jmf
%{_mavenpomdir}/JPP.ant-ant-jmf.pom #%{_mavenpomdir}/JPP.ant-ant-jmf.pom
%files -n ant-swing %files -n ant-swing
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%{_javadir}/ant/ant-swing.jar %{_javadir}/ant/ant-swing.jar
%{ant_home}/lib/ant-swing.jar %{ant_home}/lib/ant-swing.jar
%config(noreplace) %{_sysconfdir}/ant.d/swing %config(noreplace) %{_sysconfdir}/ant.d/swing
%{_mavenpomdir}/JPP.ant-ant-swing.pom #%{_mavenpomdir}/JPP.ant-ant-swing.pom
%dir %{_mavenpomdir} #%dir %{_mavenpomdir}
%files -n ant-scripts %files -n ant-scripts
%defattr(0755,root,root,0755) %defattr(0755,root,root,0755)

11
ant-junit.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Jun 9 09:05:31 UTC 2017 - tchvatal@suse.com
- Do not generate poms on ant core packages to reduce deps and
allow bootstrap
-------------------------------------------------------------------
Wed May 31 13:35:49 UTC 2017 - tchvatal@suse.com
- Fix bootstrap to avoid new cycle bsc#1041966
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 19 08:08:28 UTC 2017 - tchvatal@suse.com Fri May 19 08:08:28 UTC 2017 - tchvatal@suse.com

38
ant-junit.spec
View File

@ -45,15 +45,19 @@ Patch1: apache-ant-class-path-in-manifest.patch
Patch3: reproducible.patch Patch3: reproducible.patch
%if %{with bootstrap} %if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel BuildRequires: java-1_5_0-gcj-compat-devel
#!BuildIgnore: java-1_6_0-openjdk java-1_6_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 #!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 %else
BuildRequires: java-devel >= 1.5.0 BuildRequires: java-devel >= 1.5.0
%endif %endif
BuildRequires: antlr-bootstrap BuildRequires: antlr-bootstrap
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
# Needed for maven conversions # Needed for maven conversions
%if !%{with bootstrap}
BuildRequires: javapackages-local BuildRequires: javapackages-local
%endif
BuildRequires: unzip BuildRequires: unzip
#BuildRequires: xerces-j2-bootstrap #BuildRequires: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2-bootstrap #!BuildIgnore: xerces-j2-bootstrap
@ -457,15 +461,17 @@ do
[ $jarname == ant-bootstrap ] && continue [ $jarname == ant-bootstrap ] && continue
#install pom #install pom
%if !%{with bootstrap}
install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar"
%add_maven_depmap ${pomname} ${destname}${jarname}.jar %add_maven_depmap ${pomname} ${destname}${jarname}.jar
%endif
done done
%if %{with bootstrap} %if %{with bootstrap}
#ant-parent pom #ant-parent pom
install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/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 #%add_maven_depmap JPP-ant-parent.pom
# scripts: remove dos and os/2 scripts # scripts: remove dos and os/2 scripts
rm -f src/script/*.bat rm -f src/script/*.bat
@ -566,15 +572,15 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%{ant_home}/lib/ant-bootstrap.jar %{ant_home}/lib/ant-bootstrap.jar
%{ant_home}/lib/ant-launcher.jar %{ant_home}/lib/ant-launcher.jar
%dir %{_sysconfdir}/ant.d %dir %{_sysconfdir}/ant.d
%{_mavenpomdir}/JPP-ant-launcher.pom #%{_mavenpomdir}/JPP-ant-launcher.pom
%{_mavenpomdir}/JPP-ant-parent.pom #%{_mavenpomdir}/JPP-ant-parent.pom
%{_mavenpomdir}/JPP-ant.pom #%{_mavenpomdir}/JPP-ant.pom
%if %{?suse_version} > 1320 #%if %{?suse_version} > 1320
%{_datadir}/maven-metadata/ant.xml #%{_datadir}/maven-metadata/ant.xml
%else #%else
%config(noreplace) %{_mavendepmapfragdir}/ant #%config(noreplace) %{_mavendepmapfragdir}/ant
%endif #%endif
%dir %{_mavenpomdir} #%dir %{_mavenpomdir}
%endif %endif
%if %{with antlr} %if %{with antlr}
@ -618,15 +624,15 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%{_javadir}/ant/ant-jmf.jar %{_javadir}/ant/ant-jmf.jar
%{ant_home}/lib/ant-jmf.jar %{ant_home}/lib/ant-jmf.jar
%config(noreplace) %{_sysconfdir}/ant.d/jmf %config(noreplace) %{_sysconfdir}/ant.d/jmf
%{_mavenpomdir}/JPP.ant-ant-jmf.pom #%{_mavenpomdir}/JPP.ant-ant-jmf.pom
%files -n ant-swing %files -n ant-swing
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%{_javadir}/ant/ant-swing.jar %{_javadir}/ant/ant-swing.jar
%{ant_home}/lib/ant-swing.jar %{ant_home}/lib/ant-swing.jar
%config(noreplace) %{_sysconfdir}/ant.d/swing %config(noreplace) %{_sysconfdir}/ant.d/swing
%{_mavenpomdir}/JPP.ant-ant-swing.pom #%{_mavenpomdir}/JPP.ant-ant-swing.pom
%dir %{_mavenpomdir} #%dir %{_mavenpomdir}
%files -n ant-scripts %files -n ant-scripts
%defattr(0755,root,root,0755) %defattr(0755,root,root,0755)

6
ant.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 9 09:05:31 UTC 2017 - tchvatal@suse.com
- Do not generate poms on ant core packages to reduce deps and
allow bootstrap
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 31 13:35:49 UTC 2017 - tchvatal@suse.com Wed May 31 13:35:49 UTC 2017 - tchvatal@suse.com

32
ant.spec
View File

@ -54,7 +54,9 @@ BuildRequires: java-devel >= 1.5.0
BuildRequires: antlr-bootstrap BuildRequires: antlr-bootstrap
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
# Needed for maven conversions # Needed for maven conversions
%if !%{with bootstrap}
BuildRequires: javapackages-local BuildRequires: javapackages-local
%endif
BuildRequires: unzip BuildRequires: unzip
#BuildRequires: xerces-j2-bootstrap #BuildRequires: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2-bootstrap #!BuildIgnore: xerces-j2-bootstrap
@ -458,15 +460,17 @@ do
[ $jarname == ant-bootstrap ] && continue [ $jarname == ant-bootstrap ] && continue
#install pom #install pom
%if !%{with bootstrap}
install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar"
%add_maven_depmap ${pomname} ${destname}${jarname}.jar %add_maven_depmap ${pomname} ${destname}${jarname}.jar
%endif
done done
%if %{with bootstrap} %if %{with bootstrap}
#ant-parent pom #ant-parent pom
install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/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 #%add_maven_depmap JPP-ant-parent.pom
# scripts: remove dos and os/2 scripts # scripts: remove dos and os/2 scripts
rm -f src/script/*.bat rm -f src/script/*.bat
@ -567,15 +571,15 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%{ant_home}/lib/ant-bootstrap.jar %{ant_home}/lib/ant-bootstrap.jar
%{ant_home}/lib/ant-launcher.jar %{ant_home}/lib/ant-launcher.jar
%dir %{_sysconfdir}/ant.d %dir %{_sysconfdir}/ant.d
%{_mavenpomdir}/JPP-ant-launcher.pom #%{_mavenpomdir}/JPP-ant-launcher.pom
%{_mavenpomdir}/JPP-ant-parent.pom #%{_mavenpomdir}/JPP-ant-parent.pom
%{_mavenpomdir}/JPP-ant.pom #%{_mavenpomdir}/JPP-ant.pom
%if %{?suse_version} > 1320 #%if %{?suse_version} > 1320
%{_datadir}/maven-metadata/ant.xml #%{_datadir}/maven-metadata/ant.xml
%else #%else
%config(noreplace) %{_mavendepmapfragdir}/ant #%config(noreplace) %{_mavendepmapfragdir}/ant
%endif #%endif
%dir %{_mavenpomdir} #%dir %{_mavenpomdir}
%endif %endif
%if %{with antlr} %if %{with antlr}
@ -619,15 +623,15 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%{_javadir}/ant/ant-jmf.jar %{_javadir}/ant/ant-jmf.jar
%{ant_home}/lib/ant-jmf.jar %{ant_home}/lib/ant-jmf.jar
%config(noreplace) %{_sysconfdir}/ant.d/jmf %config(noreplace) %{_sysconfdir}/ant.d/jmf
%{_mavenpomdir}/JPP.ant-ant-jmf.pom #%{_mavenpomdir}/JPP.ant-ant-jmf.pom
%files -n ant-swing %files -n ant-swing
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%{_javadir}/ant/ant-swing.jar %{_javadir}/ant/ant-swing.jar
%{ant_home}/lib/ant-swing.jar %{ant_home}/lib/ant-swing.jar
%config(noreplace) %{_sysconfdir}/ant.d/swing %config(noreplace) %{_sysconfdir}/ant.d/swing
%{_mavenpomdir}/JPP.ant-ant-swing.pom #%{_mavenpomdir}/JPP.ant-ant-swing.pom
%dir %{_mavenpomdir} #%dir %{_mavenpomdir}
%files -n ant-scripts %files -n ant-scripts
%defattr(0755,root,root,0755) %defattr(0755,root,root,0755)