From a3d96c12df6066e2131a2185abd4a4b30115fd6b46ce4bcdbebae553bfe51f62 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 31 Oct 2018 10:21:17 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=121 --- ant-antlr.changes | 6 ++++++ ant-antlr.spec | 9 +++++++-- ant-junit.changes | 6 ++++++ ant-junit.spec | 9 +++++++-- ant.changes | 6 ++++++ ant.spec | 9 +++++++-- 6 files changed, 39 insertions(+), 6 deletions(-) diff --git a/ant-antlr.changes b/ant-antlr.changes index faeb135..53302d7 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 31 10:20:23 UTC 2018 - Fridrich Strba + +- Add aliases to some maven artifacts so that packages out there + resolve then correctly + ------------------------------------------------------------------- Fri Oct 26 09:54:04 UTC 2018 - Pedro Monreal Gonzalez diff --git a/ant-antlr.spec b/ant-antlr.spec index 4710092..fdfe1cf 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -455,8 +455,13 @@ do #install pom install -m 644 src%{_sysconfdir}/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} - echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" - %add_maven_depmap ${pomname} ${destname}${jarname}.jar + if [ $jarname == ant-launcher ]; then + %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher + elif [ $jarname == ant ]; then + %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant + else + %add_maven_depmap ${pomname} ${destname}${jarname}.jar + fi done %if %{with bootstrap} diff --git a/ant-junit.changes b/ant-junit.changes index faeb135..53302d7 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 31 10:20:23 UTC 2018 - Fridrich Strba + +- Add aliases to some maven artifacts so that packages out there + resolve then correctly + ------------------------------------------------------------------- Fri Oct 26 09:54:04 UTC 2018 - Pedro Monreal Gonzalez diff --git a/ant-junit.spec b/ant-junit.spec index 5a5e051..8124440 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -455,8 +455,13 @@ do #install pom install -m 644 src%{_sysconfdir}/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} - echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" - %add_maven_depmap ${pomname} ${destname}${jarname}.jar + if [ $jarname == ant-launcher ]; then + %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher + elif [ $jarname == ant ]; then + %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant + else + %add_maven_depmap ${pomname} ${destname}${jarname}.jar + fi done %if %{with bootstrap} diff --git a/ant.changes b/ant.changes index faeb135..53302d7 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 31 10:20:23 UTC 2018 - Fridrich Strba + +- Add aliases to some maven artifacts so that packages out there + resolve then correctly + ------------------------------------------------------------------- Fri Oct 26 09:54:04 UTC 2018 - Pedro Monreal Gonzalez diff --git a/ant.spec b/ant.spec index 7849d80..fcb1834 100644 --- a/ant.spec +++ b/ant.spec @@ -454,8 +454,13 @@ do #install pom install -m 644 src%{_sysconfdir}/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} - echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" - %add_maven_depmap ${pomname} ${destname}${jarname}.jar + if [ $jarname == ant-launcher ]; then + %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher + elif [ $jarname == ant ]; then + %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant + else + %add_maven_depmap ${pomname} ${destname}${jarname}.jar + fi done %if %{with bootstrap} From 74ab86ec74b855c952e4e24948484ff914369940a538f903e80ed3250e04f6f2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 26 Nov 2018 08:08:13 +0000 Subject: [PATCH 2/2] - Let ant-antlr provide ant-xz too, since it contains the corresponding jar. - Let ant-antlr provide ant-xz too, since it contains the corresponding jar. - Let ant-antlr provide ant-xz too, since it contains the corresponding jar. OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=123 --- ant-antlr.changes | 6 ++++++ ant-antlr.spec | 1 + ant-junit.changes | 6 ++++++ ant-junit.spec | 1 + ant.changes | 6 ++++++ ant.spec | 1 + 6 files changed, 21 insertions(+) diff --git a/ant-antlr.changes b/ant-antlr.changes index 53302d7..9ee5d4a 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 26 08:07:13 UTC 2018 - Fridrich Strba + +- Let ant-antlr provide ant-xz too, since it contains the + corresponding jar. + ------------------------------------------------------------------- Wed Oct 31 10:20:23 UTC 2018 - Fridrich Strba diff --git a/ant-antlr.spec b/ant-antlr.spec index fdfe1cf..5e65172 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -85,6 +85,7 @@ Provides: ant-trax = %{version} Requires: antlr %requires_eq ant Provides: ant-antlr = %{version}-%{release} +Provides: ant-xz = %{version}-%{release} Obsoletes: ant-javadoc %endif %if %{with junit} diff --git a/ant-junit.changes b/ant-junit.changes index 53302d7..9ee5d4a 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 26 08:07:13 UTC 2018 - Fridrich Strba + +- Let ant-antlr provide ant-xz too, since it contains the + corresponding jar. + ------------------------------------------------------------------- Wed Oct 31 10:20:23 UTC 2018 - Fridrich Strba diff --git a/ant-junit.spec b/ant-junit.spec index 8124440..4f22759 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -85,6 +85,7 @@ Provides: ant-trax = %{version} Requires: antlr %requires_eq ant Provides: ant-antlr = %{version}-%{release} +Provides: ant-xz = %{version}-%{release} Obsoletes: ant-javadoc %endif %if %{with junit} diff --git a/ant.changes b/ant.changes index 53302d7..9ee5d4a 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 26 08:07:13 UTC 2018 - Fridrich Strba + +- Let ant-antlr provide ant-xz too, since it contains the + corresponding jar. + ------------------------------------------------------------------- Wed Oct 31 10:20:23 UTC 2018 - Fridrich Strba diff --git a/ant.spec b/ant.spec index fcb1834..53fa2ab 100644 --- a/ant.spec +++ b/ant.spec @@ -84,6 +84,7 @@ Provides: ant-trax = %{version} Requires: antlr %requires_eq ant Provides: ant-antlr = %{version}-%{release} +Provides: ant-xz = %{version}-%{release} Obsoletes: ant-javadoc %endif %if %{with junit}