From e85de8ef7b965d3dbd65f95457c0edbc6d0f4c0be6e5ec5029c6551c04e029d3 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 30 Apr 2009 22:20:22 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant-contrib?expand=0&rev=4 --- ant-contrib.changes | 11 +++++++++++ ant-contrib.spec | 17 +++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ant-contrib.changes b/ant-contrib.changes index d9bbc9c..8705f6a 100644 --- a/ant-contrib.changes +++ b/ant-contrib.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Apr 30 15:49:13 CEST 2009 - mrueckert@suse.de + +- rename ant_version to ant_minimal_version +- use requires_eq for the ant package + +------------------------------------------------------------------- +Thu Apr 30 14:25:51 CEST 2009 - ro@suse.de + +- bump ant-version to 1.7.1 + ------------------------------------------------------------------- Thu Sep 11 15:52:09 CEST 2008 - mvyskocil@suse.cz diff --git a/ant-contrib.spec b/ant-contrib.spec index 3042a2e..cd57df4 100644 --- a/ant-contrib.spec +++ b/ant-contrib.spec @@ -1,7 +1,7 @@ # # spec file for package ant-contrib (Version 1.0b2) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,12 @@ %define with_junit 0 %define section free -%define ant_version 1.7.0 +%define ant_minimal_version 1.7.1 Summary: Collection of tasks for Ant Name: ant-contrib Version: 1.0b2 -Release: 39 +Release: 40 License: The Apache Software License Url: http://ant-contrib.sourceforge.net/ Group: Development/Libraries/Java @@ -36,14 +36,14 @@ Patch0: ant-contrib-build_xml.patch Patch1: ant-contrib-ant-1.7.0.patch Patch2: ant-contrib-BuildFileTest_java.patch BuildRequires: jpackage-utils >= 1.6 -BuildRequires: ant = %{ant_version} +BuildRequires: ant >= %{ant_minimal_version} BuildRequires: bcel >= 5.1 BuildRequires: java-1_5_0-gcj-compat-devel %if %{with_junit} -BuildRequires: ant-junit = %{ant_version} +BuildRequires: ant-junit >= %{ant_minimal_version} Requires: junit >= 3.8.1 %endif -Requires: ant = %{ant_version} +%requires_eq ant Requires: bcel >= 5.1 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -151,6 +151,11 @@ fi # ----------------------------------------------------------------------------- %changelog +* Thu Apr 30 2009 mrueckert@suse.de +- rename ant_version to ant_minimal_version +- use requires_eq for the ant package +* Thu Apr 30 2009 ro@suse.de +- bump ant-version to 1.7.1 * Thu Sep 11 2008 mvyskocil@suse.cz - Use a gcc-java to build * Fri Aug 08 2008 mvyskocil@suse.cz