From root@Hilbert.suse.de Tue Jul 10 13:22:51 2007
From: root@Hilbert.suse.de
To: commit@lists.opensuse.org
Subject: commit ant
Date: Tue, 10 Jul 2007 15:24:52 +0200
Message-ID: <20070710132452.BF2C4678182@Hilbert.suse.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1705775219187373285=="

--===============1705775219187373285==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable


Hello community,

here is the log from the commit of package ant
checked in at Tue Jul 10 15:24:52 CEST 2007.

--------
New Changes file:

--- /dev/null	2006-09-20 18:56:23.000000000 +0200
+++ /mounts/work_src_done/NOARCH/ant/ant-antlr.changes	2007-07-08 00:14:38.00=
0000000 +0200
@@ -0,0 +1,292 @@
+-------------------------------------------------------------------
+Sun Jul  8 00:14:04 CEST 2007 - dbornkessel(a)suse.de
+
+- add links to jar files in /usr/share/ant/lib
+
+-------------------------------------------------------------------
+Fri Jul  6 19:24:52 CEST 2007 - dbornkessel(a)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:
+ -------------------------------------------
+=20
+ * 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.
+=20
+ * 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.
+=20
+ * Removed launcher classes from nodeps jar.
+=20
+ * <classconstants> filter reader uses ISO-8859-1 encoding to read
+   the java class file. Bugzilla report 33604.
+=20
+ * 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, durin=
g 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 s=
omewhere
+   where it is used, or fix the depends attribute of the target in question =
to
+   depend on the target which defines the reference/datatype.
+=20
+ * <script> and <scriptdef> now set the current thread context.
+=20
+ * Unrestrict the dbvendor names in the websphere element of the ejbjar task.
+   Bugzilla Report 40475.
+=20
+ * <env> nested element in <java>, <exec> and others is now case-insensitive
+   for windows OS. Bugzilla Report 28874.
+=20
+ * Removed support for xalan1 completely. Users of Xalan1 for Ant builds will
+   have to stay at ant 1.6.5 or upgrade to xalan2.
+=20
+ * Use org.apache.log4j.Logger instead of org.apache.log4j.Category.
+   Category has been deprecated for ~2 years and has been removed from
+   the log4j code.  Logger was introduced in log4j 1.2 so users of
+   log4j 1.1 and log4j 1.0 need to upgrade to a newer version of log4j.
+   Bugzilla Report 31951.
+=20
+ * build.sysclasspath now also affects the bootclasspath handling of
+   spawned Java VMs.  If you set build.sysclasspath to anything other
+   than "ignore" (or leave it unset, since "ignore" is the default when
+   it comes to bootclasspath handling), then the bootclasspath of the
+   VM running Ant will be added to the bootclasspath you've specified.
+=20
+ * The <java fork=3D"false"> now as per default installs a security manager
+   using the default permissions. This is now independent of the
+   failonerror attribute.  Bugzilla report 33361.
+=20
+ * <signjar> now notices when the jar and signedjar are equal, and switches
+   to the same dependency logic as when signedjar is omitted. This may break
+   something that depended upon signing in this situation. However, since
+   invoking the JDK jarsigner program with -signedjar set to the source jar
+   actually crashes the JVM on our (Java1.5) systems, we don't think any
+   build files which actually worked will be affected by the change.
+=20
+ * <signjar> used to ignore a nested fileset when a jar was also provided as=
 an
+   attribute, printing a warning message; now it signs files in the fileset.
+=20
+ * An improved method of handling timestamp granularity differences between
+   client and server was added to the <ftp> task.  FTP servers typically
+   have HH:mm timestamps whereas local filesystems have HH:mm:ss timestamps.
+   Previously, this required tweaking with the timediffmillis attribute
+   which also was used to handle timezone differences.  Now, there is a new
+   timestampgranularity attribute.  The default value for get operations is 0
+   since the user has the more powerful preservelastmodified attribute to wo=
rk
+   with.  Since this is not available on put operations the default value
+   adds a minute to the server timestamp in order to account for this,
+   Scripts which previously used timediffmillis to do this compensation may
+   need to be rewritten.  timediffmillis has now been deprecated.
+=20
+ * On Java1.5+, Ant automatically sets the system property
+   java.net.useSystemProxies to true, which gives it automatic use of the lo=
cal
+   IE (Windows) or Gnome2 (Unix/Linux) proxy settings. This may break any bu=
ild
+   file that somehow relied on content outside the firewall being unreachabl=
e:
+   use the -noproxy command-line option to disable this new feature.
+   Note that the Java1.5 proxy configuration system still does not
+   appear to work reliably on Windows or Linux.
+=20
+ * Support for the XSL:P XML parser has been removed.
+   Bugzilla Report 23455.
+=20
+ * Visual Age for Java optional tasks removed.
+=20
+ * Testlet (test) optional task removed.
+=20
+ * Icontract optional task removed.
+=20
+ * Metamata (maudit, mmetrics, and mparse tasks) removed.
+=20
+ * Sitraka (jpcoverage, jpcovmerge, jpcovreport) tasks suppressed.
+=20
+ * <fixcrlf> used \r (Mac) line endings on OS X, whose proper line separator
+   is \n (Unix).  Bugzilla report 39585.
+=20
+ * <scp> now optionally supports the sftp protocol, you may need a
+   newer jsch.jar.  Bugzilla Report 39373.
+=20
+ * Ant launcher program prints errors to stderr, and exits with a 2 exit code
+   value if, for any reason, it cannot actually start Ant proper. This will =
only
+   affect programs/scripts that called the launcher and which did not want to
+   receive an error if Ant itself would not start
+=20
+ * All .NET tasks are now deprecated in favor of the new .NET Antlib:
+   http://ant.apache.org/antlibs/dotnet/index.html
+=20
+-------------------------------------------------------------------
+Tue May  8 10:39:14 CEST 2007 - dbornkessel(a)suse.de
+
+- removed all jai stuff as jai was dropped=20
+
+-------------------------------------------------------------------
+Fri Sep 22 15:48:51 CEST 2006 - dbornkessel(a)suse.de
+
+- added source=3D1.4
+
+-------------------------------------------------------------------
+Mon May  8 14:29:41 CEST 2006 - dbornkessel(a)suse.de
+
+- changed last change (see line below): Requires are only bound to the versi=
on, not to the release anymore=20
+  --> lrupp: fix Requires for ant (#171473 describes the same for dbus-1)
+
+-------------------------------------------------------------------
+Thu Feb  2 20:55:06 CET 2006 - dbornkessel(a)suse.de
+
+- fixed rpmlint errors and warnings=20
+
+-------------------------------------------------------------------
+Tue Jan 31 17:29:45 CET 2006 - dbornkessel(a)suse.de
+
+- only ant-antlr updates=20
+
+-------------------------------------------------------------------
+Fri Jan 27 12:12:48 CET 2006 - dbornkessel(a)suse.de
+
+- added four missing xsl files
+- removed JAVA_HOME magic
+
+-------------------------------------------------------------------
+Tue Jan 24 16:55:46 CET 2006 - dbornkessel(a)suse.de
+
+- Not dependend on xml-commons-apis, which are provided by xerces-j2, which =
does not=20
+  depend on ant package (in contrast to old dependency on=20
+  xml-commons-apis <-> ant)
+- optional task are now again in extra spec file ant-antlr
+=20
+
+-------------------------------------------------------------------
+Thu Jan 19 14:10:18 CET 2006 - dbornkessel(a)suse.de
+
+- Integrated ant and ant-antlr again in one spec file as there is no=20
+  dependency loop ... jpackage BuildRequires were wrong.
+- updated to version 1.6.5
+
+-------------------------------------------------------------------
+Mon Dec 19 10:46:33 CET 2005 - dbornkessel(a)suse.de
+
+- added if statement that hinders unwanted creation of a file within a for l=
oop=20
+
+-------------------------------------------------------------------
+Thu Sep 29 00:10:39 CEST 2005 - dmueller(a)suse.de
+
+ - add norootforbuild
+
+-------------------------------------------------------------------
+Fri Mar  4 13:53:08 CET 2005 - skh(a)suse.de
+
+- rely on jpackage-utils' java-functions to set JAVA_HOME correctly
+
+-------------------------------------------------------------------
+Sun Sep  5 20:00:07 CEST 2004 - skh(a)suse.de
+
+- create and add /usr/share/java/ant to file list for optional=20
+  tasks to put their jars into
+
+-------------------------------------------------------------------
+Thu Sep  2 15:58:19 CEST 2004 - skh(a)suse.de
+
+- renamed from apache-ant to ant
+- switched to JPackage 1.5 version
+- updated to version 1.6.2
++++ 95 more lines (skipped)
++++ between /dev/null
++++ and /mounts/work_src_done/NOARCH/ant/ant-antlr.changes
New Changes file:

--- /dev/null	2006-09-20 18:56:23.000000000 +0200
+++ /mounts/work_src_done/NOARCH/ant/ant.changes	2007-07-06 21:12:25.00000000=
0 +0200
@@ -0,0 +1,190 @@
+-------------------------------------------------------------------
+Fri Jul  6 19:24:52 CEST 2007 - dbornkessel(a)suse.de
+
+- 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:
+ -------------------------------------------
+=20
+ * 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.
+=20
+ * 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.
+=20
+ * Removed launcher classes from nodeps jar.
+=20
+ * <classconstants> filter reader uses ISO-8859-1 encoding to read
+   the java class file. Bugzilla report 33604.
+=20
+ * 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, durin=
g 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 s=
omewhere
+   where it is used, or fix the depends attribute of the target in question =
to
+   depend on the target which defines the reference/datatype.
+=20
+ * <script> and <scriptdef> now set the current thread context.
+=20
+ * Unrestrict the dbvendor names in the websphere element of the ejbjar task.
+   Bugzilla Report 40475.
+=20
+ * <env> nested element in <java>, <exec> and others is now case-insensitive
+   for windows OS. Bugzilla Report 28874.
+=20
+ * Removed support for xalan1 completely. Users of Xalan1 for Ant builds will
+   have to stay at ant 1.6.5 or upgrade to xalan2.
+=20
+ * Use org.apache.log4j.Logger instead of org.apache.log4j.Category.
+   Category has been deprecated for ~2 years and has been removed from
+   the log4j code.  Logger was introduced in log4j 1.2 so users of
+   log4j 1.1 and log4j 1.0 need to upgrade to a newer version of log4j.
+   Bugzilla Report 31951.
+=20
+ * build.sysclasspath now also affects the bootclasspath handling of
+   spawned Java VMs.  If you set build.sysclasspath to anything other
+   than "ignore" (or leave it unset, since "ignore" is the default when
+   it comes to bootclasspath handling), then the bootclasspath of the
+   VM running Ant will be added to the bootclasspath you've specified.
+=20
+ * The <java fork=3D"false"> now as per default installs a security manager
+   using the default permissions. This is now independent of the
+   failonerror attribute.  Bugzilla report 33361.
+=20
+ * <signjar> now notices when the jar and signedjar are equal, and switches
+   to the same dependency logic as when signedjar is omitted. This may break
+   something that depended upon signing in this situation. However, since
+   invoking the JDK jarsigner program with -signedjar set to the source jar
+   actually crashes the JVM on our (Java1.5) systems, we don't think any
+   build files which actually worked will be affected by the change.
+=20
+ * <signjar> used to ignore a nested fileset when a jar was also provided as=
 an
+   attribute, printing a warning message; now it signs files in the fileset.
+=20
+ * An improved method of handling timestamp granularity differences between
+   client and server was added to the <ftp> task.  FTP servers typically
+   have HH:mm timestamps whereas local filesystems have HH:mm:ss timestamps.
+   Previously, this required tweaking with the timediffmillis attribute
+   which also was used to handle timezone differences.  Now, there is a new
+   timestampgranularity attribute.  The default value for get operations is 0
+   since the user has the more powerful preservelastmodified attribute to wo=
rk
+   with.  Since this is not available on put operations the default value
+   adds a minute to the server timestamp in order to account for this,
+   Scripts which previously used timediffmillis to do this compensation may
+   need to be rewritten.  timediffmillis has now been deprecated.
+=20
+ * On Java1.5+, Ant automatically sets the system property
+   java.net.useSystemProxies to true, which gives it automatic use of the lo=
cal
+   IE (Windows) or Gnome2 (Unix/Linux) proxy settings. This may break any bu=
ild
+   file that somehow relied on content outside the firewall being unreachabl=
e:
+   use the -noproxy command-line option to disable this new feature.
+   Note that the Java1.5 proxy configuration system still does not
+   appear to work reliably on Windows or Linux.
+=20
+ * Support for the XSL:P XML parser has been removed.
+   Bugzilla Report 23455.
+=20
+ * Visual Age for Java optional tasks removed.
+=20
+ * Testlet (test) optional task removed.
+=20
+ * Icontract optional task removed.
+=20
+ * Metamata (maudit, mmetrics, and mparse tasks) removed.
+=20
+ * Sitraka (jpcoverage, jpcovmerge, jpcovreport) tasks suppressed.
+=20
+ * <fixcrlf> used \r (Mac) line endings on OS X, whose proper line separator
+   is \n (Unix).  Bugzilla report 39585.
+=20
+ * <scp> now optionally supports the sftp protocol, you may need a
+   newer jsch.jar.  Bugzilla Report 39373.
+=20
+ * Ant launcher program prints errors to stderr, and exits with a 2 exit code
+   value if, for any reason, it cannot actually start Ant proper. This will =
only
+   affect programs/scripts that called the launcher and which did not want to
+   receive an error if Ant itself would not start
+=20
+ * All .NET tasks are now deprecated in favor of the new .NET Antlib:
+   http://ant.apache.org/antlibs/dotnet/index.html
+=20
+-------------------------------------------------------------------
+Fri Sep 22 14:34:40 CEST 2006 - dbornkessel(a)suse.de
+
+- read in properties in /etc/ant.conf=20
+- added source=3D1.4
+
+-------------------------------------------------------------------
+Mon May  8 14:54:11 CEST 2006 - dbornkessel(a)suse.de
+
+- only ant-antlr updates
+=20
+
+-------------------------------------------------------------------
+Thu Feb  2 20:55:06 CET 2006 - dbornkessel(a)suse.de
+
+- fixed rpmlint errors and warnings=20
+
+-------------------------------------------------------------------
+Tue Jan 31 17:29:45 CET 2006 - dbornkessel(a)suse.de
+
+- only ant-antlr updates=20
+
+-------------------------------------------------------------------
+Fri Jan 27 12:12:48 CET 2006 - dbornkessel(a)suse.de
+
+- added four missing xsl files
+- removed JAVA_HOME magic
+
+-------------------------------------------------------------------
+Tue Jan 24 16:55:46 CET 2006 - dbornkessel(a)suse.de
+
+- Not dependend on xml-commons-apis, which are provided by xerces-j2, which =
does not=20
+  depend on ant package (in contrast to old dependency on=20
+  xml-commons-apis <-> ant)
+- optional task are now again in extra spec file ant-antlr
+=20
+
+-------------------------------------------------------------------
+Thu Jan 19 14:10:18 CET 2006 - dbornkessel(a)suse.de
+
+- Integrated ant and ant-antlr again in one spec file as there is no=20
+  dependency loop ... jpackage BuildRequires were wrong.
+- updated to version 1.6.5
+
+-------------------------------------------------------------------
+Mon Dec 19 10:46:33 CET 2005 - dbornkessel(a)suse.de
+
+- added if statement that hinders unwanted creation of a file within a for l=
oop=20
+
+-------------------------------------------------------------------
+Thu Sep 29 00:10:39 CEST 2005 - dmueller(a)suse.de
+
+ - add norootforbuild
+
+-------------------------------------------------------------------
+Fri Mar  4 13:53:08 CET 2005 - skh(a)suse.de
+
+- rely on jpackage-utils' java-functions to set JAVA_HOME correctly
+
+-------------------------------------------------------------------
+Sun Sep  5 20:00:07 CEST 2004 - skh(a)suse.de
+
+- create and add /usr/share/java/ant to file list for optional=20
+  tasks to put their jars into
+
+-------------------------------------------------------------------
+Thu Sep  2 15:58:19 CEST 2004 - skh(a)suse.de
+
+- renamed from apache-ant to ant
+- switched to JPackage 1.5 version
+- updated to version 1.6.2
+- split off optional tasks into separate package to solve build
+  dependency loop in JPackage
+

New:
----
  ant-1.7.0-use_system_libs.patch
  ant-antlr.changes
  ant-antlr.spec
  ant.changes
  ant.spec
  apache-ant-1.7.0.ant.conf
  apache-ant-1.7.0-rpm.patch
  apache-ant-1.7.0-src.tar.bz2
  java150_build.patch
  README.PACKAGER

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ant-antlr.spec ++++++
++++ 655 lines (skipped)

++++++ ant.spec ++++++
#
# spec file for package ant (Version 1.7.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

# norootforbuild

Name:           ant
BuildRequires:  java-devel junit 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
Summary:        A Java-Based Build Tool
License:        The Apache Software License, LICENSE.sax:
URL:            http://jakarta.apache.org/
Group:          Development/Tools/Building
Source0:        %{cvs_name}-%{version}-src.tar.bz2
Source2:        %{cvs_name}-%{version}.ant.conf
# Ant configuration file which is edited when each optional subpackage
# is installed/uninstalled
# Fix temp directory used for file containing large command strings (> 4k)
Patch0:         %{name}-%{version}-use_system_libs.patch
Patch1:         %{cvs_name}-%{version}-rpm.patch
Patch150:       java150_build.patch
Requires:       xerces-j2 >=3D 2.7.1-2
Requires:       jaxp_parser_impl
Requires:       xml-commons-apis
Requires:       xml-commons-resolver
Requires:       jpackage-utils >=3D 1.5
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
Obsoletes:      apache-ant
Provides:       apache-ant

%description
Apache Ant is a Java-based build tool. In theory, it is kind of like
Make, but without Make's wrinkles.

Why another build tool when there is already make, gnumake, nmake, jam,
and others? Because all those tools have limitations that Ant's
original author could not live with when developing software across
multiple platforms. Make-like tools are inherently shell-based--they
evaluate a set of dependencies then execute commands, not unlike what
you would issue in a shell. This means that you can easily extend these
tools by using or writing any program for the OS that you are working
on. However, this also means that you limit yourself to the OS, or at
least the OS type, such as Unix, that you are working on.

Makefiles are inherently evil as well. Anybody who has worked on them
for any time has run into the dreaded tab problem. "Is my command not
executing because I have a space in front of my tab???" said the
original author of Ant way too many times. Tools like Jam took care of
this to a great degree, but still have yet another format to use and
remember.

Ant is different. Instead of a model where it is extended with
shell-based commands, Ant is extended using Java classes. Instead of
writing shell commands, the configuration files are XML-based, calling
out a target tree where various tasks are executed. Each task is run by
an object that implements a particular task interface.

Granted, this removes some of the expressive power that is inherent by
being able to construct a shell command such as `find . -name foo -exec
rm {}`, but it gives you the ability to be cross-platform--to work
anywhere and everywhere. If you really need to execute a shell command,
Ant has an <exec> task that allows different commands to be executed
based on the OS used.



%package 	manual
Summary:        Manual for ant
Group:          Development/Tools/Building

%description 	manual
Apache Ant is a Java-based build tool.

This package contains the manual for Apache Ant.



%package 	javadoc
Summary:        Javadoc for ant
Group:          Development/Tools/Building
PreReq:         coreutils

%description 	javadoc
Apache Ant is a Java-based build tool.

This package contains the javadoc documentation for Apache Ant.



%package 	scripts
Summary:        Additional scripts for ant
Group:          Development/Tools/Building
#AutoReqProv:    no
Requires:       ant =3D %{version}
Requires:       /usr/bin/perl
Requires:       /usr/bin/python

%description 	scripts
Apache Ant is a Java-based build tool.

This package contains additional perl and python scripts for Apache
Ant.



%prep
%setup -q -n apache-ant-%{version}
%patch0
#%patch1
#%patch150 -p1
# Fix temp directory used for file containing large command strings (> 4k)
# clean jar files
find . -name "*.jar" -exec rm -f {} \;
# ---------------------------------------------------------------------------=
--

%build
find . -name "*.jar" -delete
# classpath selects optional components to build
export CLASSPATH=3D$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-=
apis junit)
#[ -n "$JAVA_HOME" ] && unset JAVA_HOME
#[ -r %{_sysconfdir}/java/java.conf ] && . %{_sysconfdir}/java/java.conf
#[ -z "$JAVA_HOME" ] && JAVA_HOME=3D%{_jvmdir}/java
#. /usr/share/java-utils/java-functions
export JAVA_HOME
sh bootstrap.sh=20
sh build.sh --noconfig jars javadocs
# ---------------------------------------------------------------------------=
--

%install
rm -rf $RPM_BUILD_ROOT
# ANT_HOME and subdirs
mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc,bin}
# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
cp -p build/lib/%{name}-launcher.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-launc=
her-%{version}.jar
# where optional tasks will put their stuff
mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
# jar aliases
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do if [ -e ${j=
ar} ]; then ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; fi; done)
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do if =
[ -e ${jar} ]; then ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; fi; do=
ne)
# link jars to ant_home/lib
pushd $RPM_BUILD_ROOT/%{ant_home}/lib
find ../../java -name "*.jar" -exec ln -sf {}  \;
popd
# scripts: remove dos and os/2 scripts
rm -f src/script/*.bat
rm -f src/script/*.cmd
# install everything else
mkdir -p $RPM_BUILD_ROOT%{_bindir}
cp -p src/script/* $RPM_BUILD_ROOT%{_bindir}
rm $RPM_BUILD_ROOT%{_bindir}/antRun*
cp -p src/script/antRun* $RPM_BUILD_ROOT%{ant_home}/bin
# default ant.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d
# ---------------------------------------------------------------------------=
--
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/ant-%{version}
cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/ant-%{version}
# fix link between manual and javadoc
pushd docs/manual
ln -sf ../../../../../ant-%{version} api
popd
# ---------------------------------------------------------------------------=
--
=20
cp  src/etc/ant-update.xsl            $RPM_BUILD_ROOT%{ant_home}/etc
cp  src/etc/changelog.xsl             $RPM_BUILD_ROOT%{ant_home}/etc
cp  src/etc/junit-frames-xalan1.xsl   $RPM_BUILD_ROOT%{ant_home}/etc
cp  src/etc/log.xsl                   $RPM_BUILD_ROOT%{ant_home}/etc
cp  src/etc/tagdiff.xsl               $RPM_BUILD_ROOT%{ant_home}/etc
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d

%clean
rm -rf $RPM_BUILD_ROOT
# ---------------------------------------------------------------------------=
--

%files
%defattr(0644,root,root,0755)
%doc KEYS LICENSE README WHATSNEW
%attr(0755,root,root) %{_bindir}/ant
#% attr(0755,root,root) % {_bindir}/complete-ant-cmd.pl
#% attr(0755,root,root) % {_bindir}/runant.pl
#% attr(0755,root,root) % {_bindir}/runant.py
%attr(0755,root,root) %{ant_home}/bin
%dir %{_javadir}/%{name}
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-launcher.jar
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}-launcher-%{version}.jar
%dir %{ant_home}
%dir %{_sysconfdir}/%{name}.d
%config %dir %{_sysconfdir}/%{name}.conf
%exclude %{_bindir}/*.pl
%exclude %{_bindir}/*.py
%dir %{ant_home}/lib
%{ant_home}/lib/*
%{ant_home}/etc
# ---------------------------------------------------------------------------=
--

%files 	scripts
%defattr(0755,root,root,0755)
%{_bindir}/*.pl
%{_bindir}/*.py

%files 	manual
%defattr(0644,root,root,0755)
%doc docs/*

%files 	javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/ant-%{version}
# ---------------------------------------------------------------------------=
--

%changelog
* Fri Jul 06 2007 - dbornkessel(a)suse.de
- 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.
  * <classconstants> 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 w=
as
  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 ha=
ve
  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 som=
ewhere
  where it is used, or fix the depends attribute of the target in question to
  depend on the target which defines the reference/datatype.
  * <script> and <scriptdef> now set the current thread context.
  * Unrestrict the dbvendor names in the websphere element of the ejbjar task.
  Bugzilla Report 40475.
  * <env> nested element in <java>, <exec> and others is now case-insensitive
  for windows OS. Bugzilla Report 28874.
  * Removed support for xalan1 completely. Users of Xalan1 for Ant builds will
  have to stay at ant 1.6.5 or upgrade to xalan2.
  * Use org.apache.log4j.Logger instead of org.apache.log4j.Category.
  Category has been deprecated for ~2 years and has been removed from
  the log4j code.  Logger was introduced in log4j 1.2 so users of
  log4j 1.1 and log4j 1.0 need to upgrade to a newer version of log4j.
  Bugzilla Report 31951.
  * build.sysclasspath now also affects the bootclasspath handling of
  spawned Java VMs.  If you set build.sysclasspath to anything other
  than "ignore" (or leave it unset, since "ignore" is the default when
  it comes to bootclasspath handling), then the bootclasspath of the
  VM running Ant will be added to the bootclasspath you've specified.
  * The <java fork=3D"false"> now as per default installs a security manager
  using the default permissions. This is now independent of the
  failonerror attribute.  Bugzilla report 33361.
  * <signjar> now notices when the jar and signedjar are equal, and switches
  to the same dependency logic as when signedjar is omitted. This may break
  something that depended upon signing in this situation. However, since
  invoking the JDK jarsigner program with -signedjar set to the source jar
  actually crashes the JVM on our (Java1.5) systems, we don't think any
  build files which actually worked will be affected by the change.
  * <signjar> used to ignore a nested fileset when a jar was also provided as=
 an
  attribute, printing a warning message; now it signs files in the fileset.
  * An improved method of handling timestamp granularity differences between
  client and server was added to the <ftp> task.  FTP servers typically
  have HH:mm timestamps whereas local filesystems have HH:mm:ss timestamps.
  Previously, this required tweaking with the timediffmillis attribute
  which also was used to handle timezone differences.  Now, there is a new
  timestampgranularity attribute.  The default value for get operations is 0
  since the user has the more powerful preservelastmodified attribute to work
  with.  Since this is not available on put operations the default value
  adds a minute to the server timestamp in order to account for this,
  Scripts which previously used timediffmillis to do this compensation may
  need to be rewritten.  timediffmillis has now been deprecated.
  * On Java1.5+, Ant automatically sets the system property
  java.net.useSystemProxies to true, which gives it automatic use of the local
  IE (Windows) or Gnome2 (Unix/Linux) proxy settings. This may break any build
  file that somehow relied on content outside the firewall being unreachable:
  use the -noproxy command-line option to disable this new feature.
  Note that the Java1.5 proxy configuration system still does not
  appear to work reliably on Windows or Linux.
  * Support for the XSL:P XML parser has been removed.
  Bugzilla Report 23455.
  * Visual Age for Java optional tasks removed.
  * Testlet (test) optional task removed.
  * Icontract optional task removed.
  * Metamata (maudit, mmetrics, and mparse tasks) removed.
  * Sitraka (jpcoverage, jpcovmerge, jpcovreport) tasks suppressed.
  * <fixcrlf> used \r (Mac) line endings on OS X, whose proper line separator
  is \n (Unix).  Bugzilla report 39585.
  * <scp> now optionally supports the sftp protocol, you may need a
  newer jsch.jar.  Bugzilla Report 39373.
  * Ant launcher program prints errors to stderr, and exits with a 2 exit code
  value if, for any reason, it cannot actually start Ant proper. This will on=
ly
  affect programs/scripts that called the launcher and which did not want to
  receive an error if Ant itself would not start
  * All .NET tasks are now deprecated in favor of the new .NET Antlib:
  http://ant.apache.org/antlibs/dotnet/index.html
* Fri Sep 22 2006 - dbornkessel(a)suse.de
- read in properties in /etc/ant.conf
- added source=3D1.4
* Mon May 08 2006 - dbornkessel(a)suse.de
- only ant-antlr updates
* Thu Feb 02 2006 - dbornkessel(a)suse.de
- fixed rpmlint errors and warnings
* Tue Jan 31 2006 - dbornkessel(a)suse.de
- only ant-antlr updates
* Fri Jan 27 2006 - dbornkessel(a)suse.de
- added four missing xsl files
- removed JAVA_HOME magic
* Tue Jan 24 2006 - dbornkessel(a)suse.de
- Not dependend on xml-commons-apis, which are provided by xerces-j2, which d=
oes not
  depend on ant package (in contrast to old dependency on
  xml-commons-apis <-> ant)
- optional task are now again in extra spec file ant-antlr
* Thu Jan 19 2006 - dbornkessel(a)suse.de
- Integrated ant and ant-antlr again in one spec file as there is no
  dependency loop ... jpackage BuildRequires were wrong.
- updated to version 1.6.5
* Mon Dec 19 2005 - dbornkessel(a)suse.de
- added if statement that hinders unwanted creation of a file within a for lo=
op
* Thu Sep 29 2005 - dmueller(a)suse.de
- add norootforbuild
* Fri Mar 04 2005 - skh(a)suse.de
- rely on jpackage-utils' java-functions to set JAVA_HOME correctly
* Sun Sep 05 2004 - skh(a)suse.de
- create and add /usr/share/java/ant to file list for optional
  tasks to put their jars into
* Thu Sep 02 2004 - skh(a)suse.de
- renamed from apache-ant to ant
- switched to JPackage 1.5 version
- updated to version 1.6.2
- split off optional tasks into separate package to solve build
  dependency loop in JPackage
++++++ ant-1.7.0-use_system_libs.patch ++++++
Index: bootstrap.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- bootstrap.sh
+++ bootstrap.sh
@@ -96,7 +96,7 @@ if [ -d "build" ] ; then
   rm -r build
 fi
=20
-CLASSPATH=3Dlib/xercesImpl.jar:lib/xml-apis.jar:${CLASSPATH}
+CLASSPATH=3D$(/usr/bin/build-classpath jaxp_parser_impl xml-commons-apis):${=
CLASSPATH}
=20
 DIRLIBS=3Dlib/optional/*.jar
 for i in ${DIRLIBS}
++++++ apache-ant-1.7.0-rpm.patch ++++++
--- src/script/ant	2004-07-16 08:56:50.000000000 +0100
+++ src/script/ant	2004-11-05 15:14:23.000000000 +0000
@@ -159,6 +159,28 @@
 # variable
 if $rpm_mode && [ -f /usr/bin/build-classpath ] ; then
   LOCALCLASSPATH=3D"$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_=
impl xml-commons-apis)"
+
+  # If no optional jars have been specified then build the default list
+  if [ -z "$OPT_JAR_LIST" ] ; then
+    for file in /etc/ant.d/*; do
+      if [ -f "$file" ]; then
+        case "$file" in
+        *~) ;;
+        *#*) ;;
+        *.rpmsave) ;;
+        *.rpmnew) ;;
+        *)
+          for dep in `cat "$file"`; do
+            case "$OPT_JAR_LIST" in
+            *"$dep"*) ;;
+            *) OPT_JAR_LIST=3D"$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep"
+            esac
+          done
+        esac
+      fi
+    done
+  fi
+
   # If the user requested to try to add some other jars to the classpath
   if [ -n "$OPT_JAR_LIST" ] ; then
     _OPTCLASSPATH=3D"$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)"
++++++ java150_build.patch ++++++
Index: apache-ant-1.6.5/src/etc/testcases/core/loaderref/loaderref.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- apache-ant-1.6.5.orig/src/etc/testcases/core/loaderref/loaderref.xml
+++ apache-ant-1.6.5/src/etc/testcases/core/loaderref/loaderref.xml
@@ -17,7 +17,7 @@ This build file is intended to be used f
=20
   <target name=3D"compile">
     <mkdir dir=3D"${classes.dir}"/>
-    <javac srcdir=3D"${src.dir}" destdir=3D"${classes.dir}"/>
+    <javac source=3D"1.4" target=3D"1.4" srcdir=3D"${src.dir}" destdir=3D"${=
classes.dir}"/>
   </target>
=20
   <target name=3D"testbadref" depends=3D"compile" >
Index: apache-ant-1.6.5/src/etc/testcases/core/taskcontainer.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- apache-ant-1.6.5.orig/src/etc/testcases/core/taskcontainer.xml
+++ apache-ant-1.6.5/src/etc/testcases/core/taskcontainer.xml
@@ -17,7 +17,7 @@
=20
   <target name=3D"testTaskdef">
     <mkdir dir=3D"${build.dir}"/>
-    <javac srcdir=3D"containersrc" destdir=3D"${build.dir}" debug=3D"on"/>
+    <javac source=3D"1.4" target=3D"1.4" srcdir=3D"containersrc" destdir=3D"=
${build.dir}" debug=3D"on"/>
=20
     <sequential>   =20
       <taskdef name=3D"sseq" classpath=3D"${build.dir}" classname=3D"test.Sp=
ecialSeq"/>
@@ -45,4 +45,4 @@
     <delete dir=3D"${build.dir}"/>
   </target>
  =20
-</project>
\ No newline at end of file
+</project>
Index: apache-ant-1.6.5/src/etc/testcases/taskdefs/available.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- apache-ant-1.6.5.orig/src/etc/testcases/taskdefs/available.xml
+++ apache-ant-1.6.5/src/etc/testcases/taskdefs/available.xml
@@ -135,7 +135,7 @@
     <!-- create a dummy file and look for it -->
     <mkdir dir=3D"${user.dir}/test"/>
     <echo message=3D"package test;public class test {}" file=3D"${user.dir}/=
test/test.java"/>
-    <javac srcdir=3D"${user.dir}" includes=3D"test/test.java"/>
+    <javac source=3D"1.4" target=3D"1.4" srcdir=3D"${user.dir}" includes=3D"=
test/test.java"/>
     <jar destfile=3D"${user.dir}/test.jar" basedir=3D"${user.dir}" includes=
=3D"test/test.class"/>
     <available property=3D"test"
                classname=3D"test.test" classpath=3D"${user.dir}/test.jar"/>
Index: apache-ant-1.6.5/src/etc/testcases/taskdefs/optional/depend/depend.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- apache-ant-1.6.5.orig/src/etc/testcases/taskdefs/optional/depend/depend.x=
ml
+++ apache-ant-1.6.5/src/etc/testcases/taskdefs/optional/depend/depend.xml
@@ -50,7 +50,7 @@
=20
   <target name=3D"compile">
     <mkdir dir=3D"${classes.dir}"/>
-    <javac srcdir=3D"${tempsrc.dir}" destdir=3D"${classes.dir}"/>
+    <javac source=3D"1.4" target=3D"1.4" srcdir=3D"${tempsrc.dir}" destdir=
=3D"${classes.dir}"/>
   </target>
  =20
   <target name=3D"clean">
@@ -135,7 +135,7 @@
         <pathelement location=3D"${classes.dir}"/>
     </path>
=20
-    <javac srcdir=3D"${tempsrc.dir}" destdir=3D"${classes.dir}"
+    <javac source=3D"1.4" target=3D"1.4" srcdir=3D"${tempsrc.dir}" destdir=
=3D"${classes.dir}"
            classpathref=3D"path.compile"/>
    =20
     <sleep seconds=3D"3"/>
Index: apache-ant-1.6.5/src/etc/testcases/types/assertions.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- apache-ant-1.6.5.orig/src/etc/testcases/types/assertions.xml
+++ apache-ant-1.6.5/src/etc/testcases/types/assertions.xml
@@ -14,6 +14,7 @@
     <mkdir dir=3D"${build.dir}"/>
     <javac srcdir=3D"${src.dir}"
       includes=3D"*.java"
+      targte=3D"1.4"
       source=3D"1.4"
       debug=3D"true"
       destdir=3D"${build.dir}"

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

--===============1705775219187373285==--