[ant-contrib/f16] Fix pom installed name.

Alexander Kurtakov akurtakov at fedoraproject.org
Tue Nov 29 12:21:44 UTC 2011


commit b151ce602c2163db8f7e6c683f8f039b8501ba79
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Tue Nov 29 14:21:24 2011 +0200

    Fix pom installed name.

 ant-contrib.spec |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/ant-contrib.spec b/ant-contrib.spec
index 987c4bb..8e4a756 100644
--- a/ant-contrib.spec
+++ b/ant-contrib.spec
@@ -3,7 +3,7 @@
 Summary:        Collection of tasks for Ant
 Name:           ant-contrib
 Version:        1.0
-Release:        0.13.%{beta_number}%{?dist}
+Release:        0.14.%{beta_number}%{?dist}
 License:        ASL 2.0
 URL:            http://ant-contrib.sourceforge.net/
 Group:          Development/Libraries
@@ -56,8 +56,6 @@ echo $ANT_HOME
 ant -Dsource=1.4 -Dversion=%{version} -Dbcel.jar=file://%{_javadir}/bcel.jar all
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # jars
 install -Dpm 644 build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
 
@@ -69,9 +67,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
 echo "ant/ant-contrib" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ant-contrib
 
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.ant-%{name}.pom
 
-%add_maven_depmap JPP-%{name}.pom ant/%{name}.jar
+%add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar
 
 %files
 %{_sysconfdir}/ant.d/ant-contrib
@@ -84,9 +82,10 @@ install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
 %files javadoc
 %doc %{_javadocdir}/%{name}
 
-# -----------------------------------------------------------------------------
-
 %changelog
+* Tue Nov 29 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.14.b2
+- Fix pom installed name.
+
 * Fri Nov 25 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.13.b2
 - Adapt to current guidelines.
 


More information about the scm-commits mailing list