diff --git a/ant-antlr.changes b/ant-antlr.changes index f3351f4..31fd1e3 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 20 15:48:54 CEST 2009 - coolo@novell.com + +- build against log4j-mini to avoid build cycle + ------------------------------------------------------------------- Wed Jun 17 10:23:50 CEST 2009 - mvyskocil@suse.cz diff --git a/ant-antlr.spec b/ant-antlr.spec index e7162c0..d2a0f8d 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -29,7 +29,7 @@ Name: ant-antlr # This line is not a comment, please do not remove it! #%(sh %{_sourcedir}/ant-antlr-prepare.sh %{_sourcedir} %{name}) Version: 1.7.1 -Release: 4 +Release: 6 %if %bootstrap Summary: Optional antlr Tasks for Ant %else @@ -105,33 +105,11 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: apache-ant Provides: apache-ant -%if %bootstrap %description Apache Ant is a Java-based build tool. This package contains optional antlr tasks for Apache Ant. - - -Apache Ant is a Java-based build tool. This package contains optional -antlr tasks for Apache Ant. - - - -%else - -%description -Apache Ant is a Java-based build tool. This package contains optional -antlr tasks for Apache Ant. - - - -Apache Ant is a Java-based build tool. This package contains optional -antlr tasks for Apache Ant. - - - -%endif %if %bootstrap %package -n ant-jmf @@ -317,7 +295,7 @@ Summary: Optional apache log4j tasks for ant Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: log4j -BuildRequires: log4j +BuildRequires: log4j-mini Provides: ant-apache-log4j = %{version}-%{release} Provides: ant-jakarta-log4j = %{version}-%{release} Obsoletes: ant-jakarta-log4j < %{version}-%{release} @@ -366,7 +344,7 @@ This package contains optional apache regexp tasks for Apache Ant. %package -n ant-javamail -License: Other uncritical OpenSource License ; Common Development and Distribution License +License: Other uncritical OpenSource License ; Common Development and Distribution License Summary: Optional javamail tasks for ant Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) @@ -894,191 +872,3 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Wed Jun 17 2009 mvyskocil@suse.cz -- do not use Release number in Requires of subpackages -* Sun May 03 2009 ro@suse.de -- do not assume release number for ant and ant-antlr are identical -* Tue Apr 28 2009 mvyskocil@suse.cz -- update to 1.7.1. Upstream changes (full list is in WHATSNEW): - * String resources only have properties single expanded. If you relied on - resources being expanded more than once, it no longer happens. - Bugzilla report 42277. - * A String resource's encoding attribute was only taken into account when - set from the resource's OutputStream; the InputStream provided the String's - binary content according to the platform's default encoding. Behavior has - been modified to encode outgoing (InputStream) content as well as encoding - incoming (OutputStream) content. - * with fork now returns gives -1 instead of 0 as result when - * failonerror - is false and some exception (including timeout) occurs. Br 42377. - * ant-type attribute has been marked as deprecated and a warning has been - issued if it is encountered in the build file. - * FileUtils.createTempFile now actually creates the file. - The TempFile task still does not create the file by default, can be - instructed to do so however using a new parameter. Bugzilla report 33969. -- added maven pom files from jpackage project -- synchronized ant.spec with jpackage.org 5.0 -- used ant-antlr-prepare.sh for generate of ant-antlr.spec from ant.spec to - keep them synchronized. Build is branched using value of %%bootstrap macro: - * bootstrap == 1 means build ant, ant-{jmf,nodeps,scripts,swing,trax} - * bootstrap == 0 means build rest of ant modules + ant-javadoc -* Wed Oct 01 2008 mvyskocil@suse.cz -- use a antlr-bootstrap do avoid another cycle -* Wed Jul 16 2008 coolo@suse.de -- avoid another build cycle -* Wed May 07 2008 mvyskocil@suse.cz -- build using gcj, to allow a openjdk6 bootstrap -- change a source and a target level to 1.5 in build.xml -* Sun Feb 17 2008 coolo@suse.de -- fix changelog for build service -* Sun Jul 08 2007 dbornkessel@suse.de -- add links to jar files in /usr/share/ant/lib -* Fri Jul 06 2007 dbornkessel@suse.de -- make packages noarch, as jai was removed -- update to version 1.7.0 - major changes are (for a complete list, consult /usr/share/doc/packages/ant/WHATSNEW): - Changes that could break older environments: - ------------------------------------------- - * Initial support for JDK 6 (JSR 223) scripting. - <*script*> tasks will now use javax.scripting if BSF is - not available, or if explicitly requested by using - a "manager" attribute. - * The -noproxy option which was in the previous 1.7 alpha and beta - releases has been removed. It is the default behavior and not needed. - * Removed launcher classes from nodeps jar. - * filter reader uses ISO-8859-1 encoding to read - the java class file. Bugzilla report 33604. - * Defer reference process. Bugzilla 36955, 34458, 37688. - This may break build files in which a reference was set in a target which was - never executed. Historically, Ant would set the reference early on, during parse - time, so the datatype would be defined. Now it requires the reference to have - been in a bit of the build file which was actually executed. If you get - an error about an undefined reference, locate the reference and move it somewhere - where it is used, or fix the depends attribute of the target in question to - depend on the target which defines the reference/datatype. - *