[ant] - Use global instead of define. - Fix parent pom install.

[Alexander Kurtakov]

commit 23212a8358ad156f29c8f1b5adefa3e91dd6e4de
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Aug 25 14:26:54 2010 +0300

    - Use global instead of define.
    - Fix parent pom install.

 ant.spec |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 8a731e5..0f54e52 100644
--- a/ant.spec
+++ b/ant.spec
@@ -36,26 +36,25 @@
 %bcond_with bootstrap
 
 %if %with bootstrap
-%define build_javadoc        0
+%global build_javadoc        0
 %else
-%define build_javadoc        1
+%global build_javadoc        1
 %endif
 
-%define _with_gcj_support 1
+%global _with_gcj_support 1
 
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+%global gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define with_manifest_only 0
+%global with_manifest_only 0
 
-%define ant_home %{_datadir}/ant
-%define section  free
+%global ant_home %{_datadir}/ant
 
-%define major_version 1.8
-%define cvs_version 1.8.1
+%global major_version 1.8
+%global cvs_version 1.8.1
 
 Name:           ant
 Version:        1.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -572,8 +571,8 @@ do
 done
 
 #ant-parent pom
-install -m 644 src/etc/poms/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
-%add_to_maven_depmap org.apache.ant ant-parent %{version} JPP/%{name} ant-parent
+install -m 644 src/etc/poms/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-parent.pom
+%add_to_maven_depmap org.apache.ant ant-parent %{version} JPP ant-parent
 
 # scripts: remove dos and os/2 scripts
 rm -f src/script/*.bat
@@ -1228,6 +1227,10 @@ fi
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Aug 25 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.8.1-2
+- Use global instead of define.
+- Fix parent pom install.
+
 * Mon Aug 16 2010 Orion Poplawski <orion at cora.nwra.com> 0:1.8.1-1
 - Update to ant 1.8.1
 - Update no-test-jar patch