[java-sig-commits] [ant] Revert define->global change (different semantic in rpm 4.9.X)

[Stanislav Ochotnicky]

commit 5a1fcaf5bc09a520d6d38a00a3367edaac7b057b
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt;
Date:   Wed Feb 9 17:52:15 2011 +0100

    Revert define->global change (different semantic in rpm 4.9.X)

 ant.spec |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 593608e..11f7ffb 100644
--- a/ant.spec
+++ b/ant.spec
@@ -28,10 +28,10 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%global with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%global without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%global bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%global bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
+%define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
+%define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
+%define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
+%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
 
 %bcond_with bootstrap
 
@@ -809,6 +809,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Feb  9 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; - 0:1.8.2-3
 - Add backward compatible maven depmap for nodeps jar
+- Revert define->global change (different semantic in rpm 4.9.X)
 
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt;
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild