rpms/ant
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove usage of %add_to_maven_depmap

Browse Source
This commit is contained in:
Mikolaj Izdebski 2013-07-17 11:35:17 +02:00
parent 7c7ca6f286
commit f646d58a48
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ant.spec
View File

@ -380,19 +380,20 @@ do
#bootstrap does not have a pom #bootstrap does not have a pom
[ $jarname == ant-bootstrap ] && continue [ $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 pom
install -p -m 644 src/etc/poms/${jarname}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/${pomname} 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 done
for mod in ant ant-bootstrap ant-launcher; do for mod in ant ant-bootstrap ant-launcher; do
ln -sf %{name}/${mod}.jar $RPM_BUILD_ROOT%{_javadir} ln -sf %{name}/${mod}.jar $RPM_BUILD_ROOT%{_javadir}
done 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 #ant-parent pom
install -p -m 644 src/etc/poms/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-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 %add_maven_depmap JPP-%{name}-parent.pom
@ -598,6 +599,7 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%changelog %changelog
* Wed Jul 17 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.9.2-1 * Wed Jul 17 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.9.2-1
- Update to upstream version 1.9.2 - Update to upstream version 1.9.2
- Remove usage of %%add_to_maven_depmap
* Tue Jul 2 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.9.1-3 * Tue Jul 2 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.9.1-3
- Remove arch-specific patch as ant is noarch now - Remove arch-specific patch as ant is noarch now