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

Fix pom filename (Resolves rhbz#655787)

Browse Source
This commit is contained in:
Stanislav Ochotnicky 2010-11-23 16:29:27 +01:00
parent 950c4fe283
commit c1261e81b1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ant.spec
View File

@ -50,7 +50,7 @@
Name: ant Name: ant
Version: 1.8.1 Version: 1.8.1
Release: 7%{?dist} Release: 8%{?dist}
Epoch: 0 Epoch: 0
Summary: Build tool for java Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi 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 for jar in build/lib/*.jar
do do
jarname=$(basename $jar .jar) jarname=$(basename $jar .jar)
pomname="JPP.%{name}-${jarname}.pom"
#Determine where to put it #Determine where to put it
case $jarname in case $jarname in
#These go into %{_javadir} #These go into %{_javadir}, pom files have different names
ant | ant-bootstrap | ant-launcher) destdir=$RPM_BUILD_ROOT%{_javadir}; destname="";; 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 #Bootstracp builds an incomplete ant-junit, don't ship it
%if %with bootstrap %if %with bootstrap
ant-junit) continue;; ant-junit) continue;;
@ -568,7 +569,7 @@ do
[ $jarname == ant-bootstrap ] && continue [ $jarname == ant-bootstrap ] && continue
#install pom #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} %add_to_maven_depmap org.apache.ant ${jarname} %{version} JPP${destname} ${jarname}
done done
@ -867,6 +868,9 @@ rm -rf $RPM_BUILD_ROOT
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* Tue Nov 23 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.8.1-8
- Fix pom filename (Resolves rhbz#655787)
* Thu Oct 28 2010 Orion Poplawski <orion@cora.nwra.com> 0:1.8.1-7 * Thu Oct 28 2010 Orion Poplawski <orion@cora.nwra.com> 0:1.8.1-7
- Build and package ant-testutil - Build and package ant-testutil