diff --git a/ant.spec b/ant.spec index bf5bb2d..a2c7b94 100644 --- a/ant.spec +++ b/ant.spec @@ -380,19 +380,20 @@ do #bootstrap does not have a pom [ $jarname == ant-bootstrap ] && continue + # add backward compatibility for nodeps jar that is now part of main + # jar + alias= + [ $jarname == ant ] && alias=org.apache.ant:ant-nodeps + #install pom install -p -m 644 src/etc/poms/${jarname}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/${pomname} - %add_maven_depmap ${pomname} %{name}/${jarname}.jar + %add_maven_depmap ${pomname} %{name}/${jarname}.jar -a "${alias}" done for mod in ant ant-bootstrap ant-launcher; do ln -sf %{name}/${mod}.jar $RPM_BUILD_ROOT%{_javadir} done -# add backward compatibility for nodeps jar that is now part of -# main jar -%add_to_maven_depmap org.apache.ant ant-nodeps %{version} JPP ant - #ant-parent pom install -p -m 644 src/etc/poms/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-parent.pom %add_maven_depmap JPP-%{name}-parent.pom @@ -598,6 +599,7 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %changelog * Wed Jul 17 2013 Mikolaj Izdebski - 0:1.9.2-1 - Update to upstream version 1.9.2 +- Remove usage of %%add_to_maven_depmap * Tue Jul 2 2013 Mikolaj Izdebski - 0:1.9.1-3 - Remove arch-specific patch as ant is noarch now