OBS User unknown 2007-08-15 10:48:17 +00:00 committed by Git OBS Bridge
parent 34384012a7
commit 2e3375a805
4 changed files with 26 additions and 3 deletions

View File

@ -0,0 +1,12 @@
diff -Naur ../apache-ant-1.7.0.orig/build.xml ./build.xml
--- ../apache-ant-1.7.0.orig/build.xml 2006-12-13 13:16:25.000000000 +0100
+++ ./build.xml 2007-08-14 13:43:46.000000000 +0200
@@ -924,7 +924,7 @@
===================================================================
-->
<target name="dist-lite"
- depends="jars,test-jar"
+ depends="jars"
description="--> creates a minimum distribution to run Apache Ant">
<mkdir dir="${dist.dir}"/>

View File

@ -15,7 +15,7 @@ BuildRequires: ant antlr bcel bsf jaf jakarta-commons-logging java-devel javama
%define ant_name ant
%define section free
Version: 1.7.0
Release: 1
Release: 9
URL: http://jakarta.apache.org/
Group: Development/Tools/Building
Source0: apache-ant-%{version}-src.tar.bz2

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Aug 14 13:52:03 CEST 2007 - skh@suse.de
- disable junit tests and remove junit from BuildRequires to break
circular build dependency
-------------------------------------------------------------------
Fri Jul 6 19:24:52 CEST 2007 - dbornkessel@suse.de

View File

@ -11,12 +11,12 @@
# norootforbuild
Name: ant
BuildRequires: java-devel junit unzip xerces-j2 xml-commons-apis-bootstrap
BuildRequires: java-devel unzip xerces-j2 xml-commons-apis-bootstrap
%define ant_home %{_datadir}/ant
%define section free
%define cvs_name apache-%{name}
Version: 1.7.0
Release: 1
Release: 7
Summary: A Java-Based Build Tool
License: The Apache Software License, LICENSE.sax:
URL: http://jakarta.apache.org/
@ -28,6 +28,7 @@ Source2: %{cvs_name}-%{version}.ant.conf
# Fix temp directory used for file containing large command strings (> 4k)
Patch0: %{name}-%{version}-use_system_libs.patch
Patch1: %{cvs_name}-%{version}-rpm.patch
Patch2: %{name}-%{version}-disable-junit-tests.patch
Patch150: java150_build.patch
Requires: xerces-j2 >= 2.7.1-2
Requires: jaxp_parser_impl
@ -118,6 +119,7 @@ Ant.
%setup -q -n apache-ant-%{version}
%patch0
#%patch1
%patch2
#%patch150 -p1
# Fix temp directory used for file containing large command strings (> 4k)
# clean jar files
@ -225,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT
# -----------------------------------------------------------------------------
%changelog
* Tue Aug 14 2007 - skh@suse.de
- disable junit tests and remove junit from BuildRequires to break
circular build dependency
* Fri Jul 06 2007 - dbornkessel@suse.de
- update to version 1.7.0
major changes are (for a complete list, consult /usr/share/doc/packages/ant/WHATSNEW):