SHA256
1
0
forked from pool/ant-contrib
OBS User unknown 2009-04-30 22:20:22 +00:00 committed by Git OBS Bridge
parent a176b348f1
commit 728f1a26e4
2 changed files with 22 additions and 6 deletions

View File

@ -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 Thu Sep 11 15:52:09 CEST 2008 - mvyskocil@suse.cz

View File

@ -1,7 +1,7 @@
# #
# spec file for package ant-contrib (Version 1.0b2) # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -20,12 +20,12 @@
%define with_junit 0 %define with_junit 0
%define section free %define section free
%define ant_version 1.7.0 %define ant_minimal_version 1.7.1
Summary: Collection of tasks for Ant Summary: Collection of tasks for Ant
Name: ant-contrib Name: ant-contrib
Version: 1.0b2 Version: 1.0b2
Release: 39 Release: 40
License: The Apache Software License License: The Apache Software License
Url: http://ant-contrib.sourceforge.net/ Url: http://ant-contrib.sourceforge.net/
Group: Development/Libraries/Java Group: Development/Libraries/Java
@ -36,14 +36,14 @@ Patch0: ant-contrib-build_xml.patch
Patch1: ant-contrib-ant-1.7.0.patch Patch1: ant-contrib-ant-1.7.0.patch
Patch2: ant-contrib-BuildFileTest_java.patch Patch2: ant-contrib-BuildFileTest_java.patch
BuildRequires: jpackage-utils >= 1.6 BuildRequires: jpackage-utils >= 1.6
BuildRequires: ant = %{ant_version} BuildRequires: ant >= %{ant_minimal_version}
BuildRequires: bcel >= 5.1 BuildRequires: bcel >= 5.1
BuildRequires: java-1_5_0-gcj-compat-devel BuildRequires: java-1_5_0-gcj-compat-devel
%if %{with_junit} %if %{with_junit}
BuildRequires: ant-junit = %{ant_version} BuildRequires: ant-junit >= %{ant_minimal_version}
Requires: junit >= 3.8.1 Requires: junit >= 3.8.1
%endif %endif
Requires: ant = %{ant_version} %requires_eq ant
Requires: bcel >= 5.1 Requires: bcel >= 5.1
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -151,6 +151,11 @@ fi
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %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 * Thu Sep 11 2008 mvyskocil@suse.cz
- Use a gcc-java to build - Use a gcc-java to build
* Fri Aug 08 2008 mvyskocil@suse.cz * Fri Aug 08 2008 mvyskocil@suse.cz