From c1261e81b109ab012d50c047a8a355b42aa4f90a Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 23 Nov 2010 16:29:27 +0100 Subject: [PATCH] Fix pom filename (Resolves rhbz#655787) --- ant.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ant.spec b/ant.spec index 0cdd66f..cfa370e 100644 --- a/ant.spec +++ b/ant.spec @@ -50,7 +50,7 @@ Name: ant Version: 1.8.1 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 0 Summary: Build tool for java Summary(it): Tool per la compilazione di programmi java @@ -545,11 +545,12 @@ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms for jar in build/lib/*.jar do jarname=$(basename $jar .jar) + pomname="JPP.%{name}-${jarname}.pom" #Determine where to put it case $jarname in -#These go into %{_javadir} - ant | ant-bootstrap | ant-launcher) destdir=$RPM_BUILD_ROOT%{_javadir}; destname="";; +#These go into %{_javadir}, pom files have different names + ant | ant-bootstrap | ant-launcher) destdir=$RPM_BUILD_ROOT%{_javadir}; destname="";pomname="JPP-$jarname.pom";; #Bootstracp builds an incomplete ant-junit, don't ship it %if %with bootstrap ant-junit) continue;; @@ -568,7 +569,7 @@ do [ $jarname == ant-bootstrap ] && continue #install pom - install -m 644 src/etc/poms/${jarname}/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-${jarname}.pom + install -m 644 src/etc/poms/${jarname}/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/${pomname} %add_to_maven_depmap org.apache.ant ${jarname} %{version} JPP${destname} ${jarname} done @@ -867,6 +868,9 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog +* Tue Nov 23 2010 Stanislav Ochotnicky - 0:1.8.1-8 +- Fix pom filename (Resolves rhbz#655787) + * Thu Oct 28 2010 Orion Poplawski 0:1.8.1-7 - Build and package ant-testutil