diff --git a/ant-1.6.5-use_system_libs.patch b/ant-1.7.0-use_system_libs.patch
similarity index 100%
rename from ant-1.6.5-use_system_libs.patch
rename to ant-1.7.0-use_system_libs.patch
diff --git a/ant-antlr.changes b/ant-antlr.changes
index b61400e..ec3751c 100644
--- a/ant-antlr.changes
+++ b/ant-antlr.changes
@@ -1,3 +1,125 @@
+-------------------------------------------------------------------
+Sun Jul  8 00:14:04 CEST 2007 - dbornkessel@suse.de
+
+- add links to jar files in /usr/share/ant/lib
+
+-------------------------------------------------------------------
+Fri Jul  6 19:24:52 CEST 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.
+ 
+ * <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 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.
+ 
+ * <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="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 only
+   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
+ 
 -------------------------------------------------------------------
 Tue May  8 10:39:14 CEST 2007 - dbornkessel@suse.de
 
diff --git a/ant-antlr.spec b/ant-antlr.spec
index 4cf18c0..ad896ce 100644
--- a/ant-antlr.spec
+++ b/ant-antlr.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package ant-antlr (Version 1.6.5)
+# spec file for package ant-antlr (Version 1.7.0)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -10,23 +10,19 @@
 
 
 Name:           ant-antlr
-BuildRequires:  ant antlr bcel bsf jaf jakarta-commons-logging java2-devel-packages javamail jdepend junit log4j oro regexp xalan-j2 xerces-j2
-# commented out as jai was dropped in 10.3
-#% ifarch % ix86
-#BuildRequires:  jai
-#% endif
+BuildRequires:  ant antlr bcel bsf jaf jakarta-commons-logging java-devel javamail jdepend junit log4j oro regexp unzip update-alternatives xalan-j2 xerces-j2
 %define ant_home %{_datadir}/ant
 %define ant_name ant
 %define section  free
-Version:        1.6.5
-Release:        85
+Version:        1.7.0
+Release:        1
 URL:            http://jakarta.apache.org/
 Group:          Development/Tools/Building
 Source0:        apache-ant-%{version}-src.tar.bz2
 # Ant configuration file which is edited when each optional subpackage
 # is installed/uninstalled
 Summary:        Optional antlr Tasks for Ant
-License:        The Apache Software License
+License:        The Apache Software License, LICENSE.sax:
 # Ant configuration file which is edited when each optional subpackage
 # is installed/uninstalled
 # Fix temp directory used for file containing large command strings (> 4k)
@@ -34,6 +30,7 @@ Requires:       %{ant_name} = %{version}
 Conflicts:      ant-optional-clean, ant-optional-full
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Patch150:       java150_build.patch
+BuildArch:      noarch
 
 %description 
 Apache Ant is a Java-based build tool. This package contains optional
@@ -256,11 +253,7 @@ find . -name "*.jar" -exec rm -f {} \;
 # -----------------------------------------------------------------------------
 
 %build
-%ifarch %ix86
-export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-logging bsf xml-commons-resolver regexp regexp javamail xml-commons-resolver jakarta-commons-logging jdepend xalan-j2) 
-%else
 export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-logging bsf xml-commons-resolver regexp regexp javamail xml-commons-resolver jakarta-commons-logging jdepend ) 
-%endif
 # perform bootstrap and build without jjp or user configs,
 # (except JAVA_HOME as required by build script)
 #[ -n "$JAVA_HOME" ] && unset JAVA_HOME
@@ -288,9 +281,6 @@ cp -p build/lib/%{ant_name}-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/ant/%
 #cp -p build/lib/% {ant_name}-commons-net.jar $RPM_BUILD_ROOT% {_javadir}/% {ant_name}/% {ant_name}-commons-net-% {version}.jar
 cp -p build/lib/%{ant_name}-junit.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-junit-%{version}.jar
 #cp -p build/lib/% {ant_name}-jsch.jar $RPM_BUILD_ROOT% {_javadir}/% {ant_name}/% {ant_name}-jsch-% {version}.jar
-#% ifarch % ix86
-#cp -p build/lib/% {ant_name}-jai.jar $RPM_BUILD_ROOT% {_javadir}/% {ant_name}/% {ant_name}-jai-% {version}.jar
-#% endif
 cp -p build/lib/%{ant_name}-nodeps.jar $RPM_BUILD_ROOT%{_javadir}/%{ant_name}/%{ant_name}-nodeps-%{version}.jar
 cp -p build/lib/%{ant_name}-swing.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-swing-%{version}.jar
 cp -p build/lib/%{ant_name}-trax.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-trax-%{version}.jar
@@ -311,9 +301,6 @@ echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/apac
 echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/apache-resolver
 echo "jakarta-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/commons-logging
 #echo "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT% {_sysconfdir}/% {ant_name}.d/commons-net
-#% ifarch % ix86
-#echo "jai ant/ant-jai" > $RPM_BUILD_ROOT% {_sysconfdir}/% {ant_name}.d/jai
-#% endif
 echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/apache-bcel
 echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/apache-log4j
 echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/apache-oro
@@ -326,29 +313,50 @@ echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/junit
 echo "ant/ant-nodeps" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/nodeps
 echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/swing
 echo "jaxp_transform_impl ant/ant-trax" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/trax
+# link jars to ant_home/lib
+mkdir -p $RPM_BUILD_ROOT/%{ant_home}/lib
+pushd $RPM_BUILD_ROOT/%{ant_home}/lib
+find ../../java/%{ant_name}/ -name "*.jar" -exec ln -sf {}  \;
+popd
 
 %files
 %defattr(0644,root,root,0755)
+%dir %{ant_home}/lib/
+%dir %{ant_home}/
 %{_javadir}/%{ant_name}/%{ant_name}-antlr.jar
+%{ant_home}/lib/%{ant_name}-antlr.jar
 %{_javadir}/%{ant_name}/%{ant_name}-antlr-%{version}.jar
+%{ant_home}/lib/%{ant_name}-antlr-%{version}.jar
 %config %{_sysconfdir}/%{ant_name}.d/antlr
 
 %files -n ant-apache-bsf
 %defattr(0644,root,root,0755)
+%dir %{ant_home}/lib/
+%dir %{ant_home}/
 %{_javadir}/%{ant_name}/%{ant_name}-apache-bsf.jar
+%{ant_home}/lib/%{ant_name}-apache-bsf.jar
 %{_javadir}/%{ant_name}/%{ant_name}-apache-bsf-%{version}.jar
+%{ant_home}/lib/%{ant_name}-apache-bsf-%{version}.jar
 %config %{_sysconfdir}/%{ant_name}.d/apache-bsf
 
 %files -n ant-apache-resolver
 %defattr(0644,root,root,0755)
+%dir %{ant_home}/lib/
+%dir %{ant_home}/
 %{_javadir}/%{ant_name}/%{ant_name}-apache-resolver.jar
+%{ant_home}/lib/%{ant_name}-apache-resolver.jar
 %{_javadir}/%{ant_name}/%{ant_name}-apache-resolver-%{version}.jar
+%{ant_home}/lib/%{ant_name}-apache-resolver-%{version}.jar
 %config %{_sysconfdir}/%{ant_name}.d/apache-resolver
 
 %files -n ant-commons-logging
 %defattr(0644,root,root,0755)
+%dir %{ant_home}/lib/
+%dir %{ant_home}/
 %{_javadir}/%{ant_name}/%{ant_name}-commons-logging.jar
+%{ant_home}/lib/%{ant_name}-commons-logging.jar
 %{_javadir}/%{ant_name}/%{ant_name}-commons-logging-%{version}.jar
+%{ant_home}/lib/%{ant_name}-commons-logging-%{version}.jar
 %config %{_sysconfdir}/%{ant_name}.d/commons-logging
 #% files -n ant-commons-net
 #% defattr(0644,root,root,0755)
@@ -357,49 +365,67 @@ echo "jaxp_transform_impl ant/ant-trax" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_na
 #% {_sysconfdir}/% {ant_name}.d/commons-net
 #% ifarch % ix86
 #
-#% files -n ant-jai
-#% defattr(0644,root,root,0755)
-#% {_javadir}/% {ant_name}/% {ant_name}-jai.jar
-#% {_javadir}/% {ant_name}/% {ant_name}-jai-% {version}.jar
-#% config % {_sysconfdir}/% {ant_name}.d/jai
-#% endif
 
 %files -n ant-apache-bcel
 %defattr(0644,root,root,0755)
+%dir %{ant_home}/lib/
+%dir %{ant_home}/
 %{_javadir}/%{ant_name}/%{ant_name}-apache-bcel.jar
+%{ant_home}/lib/%{ant_name}-apache-bcel.jar
 %{_javadir}/%{ant_name}/%{ant_name}-apache-bcel-%{version}.jar
+%{ant_home}/lib/%{ant_name}-apache-bcel-%{version}.jar
 %config %{_sysconfdir}/%{ant_name}.d/apache-bcel
 
 %files -n ant-apache-log4j
 %defattr(0644,root,root,0755)
+%dir %{ant_home}/lib/
+%dir %{ant_home}/
 %{_javadir}/%{ant_name}/%{ant_name}-apache-log4j.jar
+%{ant_home}/lib/%{ant_name}-apache-log4j.jar
 %{_javadir}/%{ant_name}/%{ant_name}-apache-log4j-%{version}.jar
+%{ant_home}/lib/%{ant_name}-apache-log4j-%{version}.jar
 %config %{_sysconfdir}/%{ant_name}.d/apache-log4j
 
 %files -n ant-apache-oro
 %defattr(0644,root,root,0755)
+%dir %{ant_home}/lib/
+%dir %{ant_home}/
 %{_javadir}/%{ant_name}/%{ant_name}-apache-oro.jar
+%{ant_home}/lib/%{ant_name}-apache-oro.jar
 %{_javadir}/%{ant_name}/%{ant_name}-apache-oro-%{version}.jar
+%{ant_home}/lib/%{ant_name}-apache-oro-%{version}.jar
 %config %{_sysconfdir}/%{ant_name}.d/apache-oro
 %dir %{ant_home}/etc/
 %{ant_home}/etc/maudit-frames.xsl
 
 %files -n ant-apache-regexp
 %defattr(0644,root,root,0755)
+%dir %{ant_home}/lib/
+%dir %{ant_home}/
 %{_javadir}/%{ant_name}/%{ant_name}-apache-regexp.jar
+%{ant_home}/lib/%{ant_name}-apache-regexp.jar
 %{_javadir}/%{ant_name}/%{ant_name}-apache-regexp-%{version}.jar
+%{ant_home}/lib/%{ant_name}-apache-regexp-%{version}.jar
 %config %{_sysconfdir}/%{ant_name}.d/apache-regexp
 
 %files -n ant-javamail
 %defattr(0644,root,root,0755)
+%dir %{ant_home}/lib/
+%dir %{ant_home}/
 %{_javadir}/%{ant_name}/%{ant_name}-javamail.jar
+%{ant_home}/lib/%{ant_name}-javamail.jar
 %{_javadir}/%{ant_name}/%{ant_name}-javamail-%{version}.jar
+%{ant_home}/lib/%{ant_name}-javamail-%{version}.jar
 %config %{_sysconfdir}/%{ant_name}.d/javamail
 
 %files -n ant-jdepend
 %defattr(0644,root,root,0755)
+%dir %{ant_home}/lib/
+%dir %{ant_home}/
 %{_javadir}/%{ant_name}/%{ant_name}-jdepend.jar
+%{ant_home}/lib/%{ant_name}-jdepend.jar
 %{_javadir}/%{ant_name}/%{ant_name}-jdepend-%{version}.jar
+%{ant_home}/lib/%{ant_name}-jdepend-%{version}.jar
 %config %{_sysconfdir}/%{ant_name}.d/jdepend
 %dir %{ant_home}/etc/
 %{ant_home}/etc/jdepend.xsl
@@ -407,8 +433,12 @@ echo "jaxp_transform_impl ant/ant-trax" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_na
 
 %files -n ant-jmf
 %defattr(0644,root,root,0755)
+%dir %{ant_home}/lib/
+%dir %{ant_home}/
 %{_javadir}/%{ant_name}/%{ant_name}-jmf.jar
+%{ant_home}/lib/%{ant_name}-jmf.jar
 %{_javadir}/%{ant_name}/%{ant_name}-jmf-%{version}.jar
+%{ant_home}/lib/%{ant_name}-jmf-%{version}.jar
 %config %{_sysconfdir}/%{ant_name}.d/jmf
 #% files -n ant-jsch
 #% defattr(0644,root,root,0755)
@@ -418,8 +448,12 @@ echo "jaxp_transform_impl ant/ant-trax" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_na
 
 %files -n ant-junit
 %defattr(0644,root,root,0755)
+%dir %{ant_home}/lib/
+%dir %{ant_home}/
 %{_javadir}/%{ant_name}/%{ant_name}-junit.jar
+%{ant_home}/lib/%{ant_name}-junit.jar
 %{_javadir}/%{ant_name}/%{ant_name}-junit-%{version}.jar
+%{ant_home}/lib/%{ant_name}-junit-%{version}.jar
 %config %{_sysconfdir}/%{ant_name}.d/junit
 %dir %{ant_home}/etc/
 %{ant_home}/etc/junit-frames.xsl
@@ -428,26 +462,127 @@ echo "jaxp_transform_impl ant/ant-trax" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_na
 
 %files -n ant-nodeps
 %defattr(0644,root,root,0755)
+%dir %{ant_home}/lib/
+%dir %{ant_home}/
 %{_javadir}/%{ant_name}/%{ant_name}-nodeps.jar
+%{ant_home}/lib/%{ant_name}-nodeps.jar
 %{_javadir}/%{ant_name}/%{ant_name}-nodeps-%{version}.jar
+%{ant_home}/lib/%{ant_name}-nodeps-%{version}.jar
 %config %{_sysconfdir}/%{ant_name}.d/nodeps
+%{ant_home}/etc/common2master.xsl
 
 %files -n ant-swing
 %defattr(0644,root,root,0755)
+%dir %{ant_home}/lib/
+%dir %{ant_home}/
 %{_javadir}/%{ant_name}/%{ant_name}-swing.jar
+%{ant_home}/lib/%{ant_name}-swing.jar
 %{_javadir}/%{ant_name}/%{ant_name}-swing-%{version}.jar
+%{ant_home}/lib/%{ant_name}-swing-%{version}.jar
 %config %{_sysconfdir}/%{ant_name}.d/swing
 
 %files -n ant-trax
 %defattr(0644,root,root,0755)
+%dir %{ant_home}/lib/
+%dir %{ant_home}/
 %{_javadir}/%{ant_name}/%{ant_name}-trax.jar
+%{ant_home}/lib/%{ant_name}-trax.jar
 %{_javadir}/%{ant_name}/%{ant_name}-trax-%{version}.jar
+%{ant_home}/lib/%{ant_name}-trax-%{version}.jar
 %config %{_sysconfdir}/%{ant_name}.d/trax
 %dir %{ant_home}/etc/
 %{ant_home}/etc/mmetrics-frames.xsl
 %{ant_home}/etc/coverage-frames.xsl
 
 %changelog
+* 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.
+  * <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 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.
+  * <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="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 only
+  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
 * Tue May 08 2007 - dbornkessel@suse.de
 - removed all jai stuff as jai was dropped
 * Fri Sep 22 2006 - dbornkessel@suse.de
diff --git a/ant.changes b/ant.changes
index e7ca803..29a3023 100644
--- a/ant.changes
+++ b/ant.changes
@@ -1,3 +1,119 @@
+-------------------------------------------------------------------
+Fri Jul  6 19:24:52 CEST 2007 - dbornkessel@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 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.
+ 
+ * <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="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 only
+   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 14:34:40 CEST 2006 - dbornkessel@suse.de
 
diff --git a/ant.spec b/ant.spec
index 53af8f7..a38dee2 100644
--- a/ant.spec
+++ b/ant.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package ant (Version 1.6.5)
+# 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
@@ -11,18 +11,18 @@
 # norootforbuild
 
 Name:           ant
-BuildRequires:  java2-devel-packages xerces-j2
+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.6.5
-Release:        67
+Version:        1.7.0
+Release:        1
 Summary:        A Java-Based Build Tool
-License:        The Apache Software License
+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}-1.6.5.ant.conf
+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)
@@ -117,8 +117,8 @@ Ant.
 %prep
 %setup -q -n apache-ant-%{version}
 %patch0
-%patch1
-%patch150 -p1
+#%patch1
+#%patch150 -p1
 # Fix temp directory used for file containing large command strings (> 4k)
 # clean jar files
 find . -name "*.jar" -exec rm -f {} \;
@@ -127,7 +127,7 @@ find . -name "*.jar" -exec rm -f {} \;
 %build
 find . -name "*.jar" -delete
 # classpath selects optional components to build
-export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis)
+export CLASSPATH=$(%{_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=%{_jvmdir}/java
@@ -139,7 +139,6 @@ sh build.sh --noconfig jars javadocs
 
 %install
 rm -rf $RPM_BUILD_ROOT
-rm src/script/ant.orig
 # ANT_HOME and subdirs
 mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc,bin}
 # jars
@@ -151,6 +150,10 @@ mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
 # jar aliases
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do if [ -e ${jar} ]; 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; done)
+# 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
@@ -203,6 +206,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_bindir}/*.pl
 %exclude %{_bindir}/*.py
 %dir %{ant_home}/lib
+%{ant_home}/lib/*
 %{ant_home}/etc
 # -----------------------------------------------------------------------------
 
@@ -221,6 +225,91 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
+* 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):
+  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 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.
+  * <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="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 only
+  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@suse.de
 - read in properties in /etc/ant.conf
 - added source=1.4
diff --git a/apache-ant-1.6.5-src.tar.bz2 b/apache-ant-1.6.5-src.tar.bz2
deleted file mode 100644
index 4e86aa0..0000000
--- a/apache-ant-1.6.5-src.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59
-size 6283500
diff --git a/apache-ant-1.6.5-rpm.patch b/apache-ant-1.7.0-rpm.patch
similarity index 100%
rename from apache-ant-1.6.5-rpm.patch
rename to apache-ant-1.7.0-rpm.patch
diff --git a/apache-ant-1.7.0-src.tar.bz2 b/apache-ant-1.7.0-src.tar.bz2
new file mode 100644
index 0000000..f26fa5b
--- /dev/null
+++ b/apache-ant-1.7.0-src.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a6698e8420f6d1cefd9e02c5a6b610b84495a3f9bfe1fc9e1b4fe8a8769e3779
+size 6831017
diff --git a/apache-ant-1.6.5.ant.conf b/apache-ant-1.7.0.ant.conf
similarity index 100%
rename from apache-ant-1.6.5.ant.conf
rename to apache-ant-1.7.0.ant.conf