From 66ed79659e675c1e76b8dd9b79d5e6a8b353cbf3 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Aug 26 2010 21:01:27 +0000
Subject: - Remove -SNAPSHOT from version


---

diff --git a/ant.spec b/ant.spec
index 46e5b94..8a86576 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:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        Build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -574,8 +573,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
@@ -1230,9 +1229,13 @@ fi
 # -----------------------------------------------------------------------------
 
 %changelog
-* Thu Aug 26 2010 Orion Poplawski <orion@cora.nwra.com> 0:1.8.1-2
+* Thu Aug 26 2010 Orion Poplawski <orion@cora.nwra.com> 0:1.8.1-3
 - Remove -SNAPSHOT from version
 
+* Wed Aug 25 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.8.1-2
+- Use global instead of define.
+- Fix parent pom install.
+
 * Mon Aug 16 2010 Orion Poplawski <orion@cora.nwra.com> 0:1.8.1-1
 - Update to ant 1.8.1
 - Update no-test-jar patch