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 - 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 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild