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}