Fridrich Strba 2018-10-31 10:21:17 +00:00 committed by Git OBS Bridge
parent 2c0e914912
commit a3d96c12df
6 changed files with 39 additions and 6 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 31 10:20:23 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- 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 <pmonrealgonzalez@suse.com>

View File

@ -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}

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 31 10:20:23 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- 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 <pmonrealgonzalez@suse.com>

View File

@ -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}

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 31 10:20:23 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- 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 <pmonrealgonzalez@suse.com>

View File

@ -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}