diff --git a/.cvsignore b/.cvsignore
index f35cd09..1058b9f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,3 @@
-apache-ant-1.6.1-src.tar.bz2
-apache-ant-1.6.1
+ant-1.6.1-1jpp_3fc.noarch.rpm
 noarch
 *.src.rpm
diff --git a/ant.spec b/ant.spec
index 458687c..8e15676 100644
--- a/ant.spec
+++ b/ant.spec
@@ -16,18 +16,11 @@ URL:            http://ant.apache.org/
 Group:          Development/Build Tools
 #Vendor:         JPackage Project
 #Distribution:   JPackage
-Source0:        http://www.apache.org/dist/ant/source/apache-ant-1.6.1-src.tar.bz2
-                # ant launch script, (may not be required for 1.6.2+)
-Source1:        apache-ant-%{version}.ant
-Source2:        apache-ant-%{version}.ant.conf
+Source0:        %{name}-%{version}-%{release}.noarch.rpm
 # Fix temp directory used for file containing large command strings (> 4k)
-Patch0:         apache-ant-%{version}.patch
-Patch1:         apache-ant-javac-ecj.patch
 Requires:       jaxp_parser_impl
 Requires:       jpackage-utils >= 0:1.5
-BuildRequires:  jaxp_parser_impl
-BuildRequires:  jpackage-utils >= 0:1.5
-BuildRequires:  java-devel
+BuildRequires:  rpm, cpio
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Obsoletes:	ant-optional ant-optional-full
@@ -48,425 +41,13 @@ compilazione di programmi java.
 Allo stato attuale viene utilizzato dai progetti apache jakarta ed
 apache xml.
 
-%package antlr
-Summary:        Optional antlr tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       antlr
-BuildRequires:  antlr
-Provides:       ant-antlr = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%description antlr
-Optional antlr tasks for %{name}.
-
-%description antlr -l fr
-Taches antlr optionelles pour %{name}.
-
-%if !%{no_bsf}
-%package apache-bsf
-Summary:        Optional apache bsf tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       bsf
-BuildRequires:  bsf
-Provides:       ant-apache-bsf = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%description apache-bsf
-Optional apache bsf tasks for %{name}.
-
-%description apache-bsf -l fr
-Taches apache bsf optionelles pour %{name}.
-%endif
-
-%package apache-resolver
-Summary:        Optional apache resolver tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       xml-commons-resolver
-BuildRequires:  xml-commons-resolver
-Provides:       ant-apache-resolver = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%description apache-resolver
-Optional apache resolver tasks for %{name}.
-
-%description apache-resolver -l fr
-Taches apache resolver optionelles pour %{name}.
-
-%package commons-logging
-Summary:        Optional commons logging tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       jakarta-commons-logging
-BuildRequires:  jakarta-commons-logging
-Provides:       ant-commons-logging = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%description commons-logging
-Optional commons logging tasks for %{name}.
-
-%description commons-logging -l fr
-Taches commons logging optionelles pour %{name}.
-
-#%package commons-net
-#Summary:        Optional commons net tasks for %{name}
-#Group:          Development/Build Tools
-#Requires:       %{name} = %{epoch}:%{version}-%{release}
-#Requires:       jakarta-commons-net
-#BuildRequires:  jakarta-commons-net
-#Provides:       ant-commons-net = %{epoch}:%{version}-%{release}
-#Conflicts:      ant-optional-clean, ant-optional-full
-
-#%description commons-net
-#Optional commons net tasks for %{name}.
-
-#%description commons-net -l fr
-#Taches commons net optionelles pour %{name}.
-
-#%package jai
-#Summary:        Optional jai tasks for %{name}
-#Group:          Development/Build Tools
-#Requires:       %{name} = %{epoch}:%{version}-%{release}
-#Requires:       jai
-#BuildRequires:  jai
-#Provides:       ant-jai = %{epoch}:%{version}-%{release}
-#Conflicts:      ant-optional-clean, ant-optional-full
-
-#%description jai
-#Optional jai tasks for %{name}.
-
-#%description jai -l fr
-#Taches jai optionelles pour %{name}.
-
-%package jakarta-bcel
-Summary:        Optional jakarta bcel tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       bcel
-BuildRequires:  bcel
-Provides:       ant-jakarta-bcel = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%description jakarta-bcel
-Optional jakarta bcel tasks for %{name}.
-
-%description jakarta-bcel -l fr
-Taches jakarta bcel optionelles pour %{name}.
-
-%package jakarta-log4j
-Summary:        Optional jakarta log4j tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       log4j
-BuildRequires:  log4j
-Provides:       ant-jakarta-log4j = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%description jakarta-log4j
-Optional jakarta log4j tasks for %{name}.
-
-%description jakarta-log4j -l fr
-Taches jakarta log4j optionelles pour %{name}.
-
-%package jakarta-oro
-Summary:        Optional jakarta oro tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       oro
-BuildRequires:  oro
-Provides:       ant-jakarta-oro = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%description jakarta-oro
-Optional jakarta oro tasks for %{name}.
-
-%description jakarta-oro -l fr
-Taches jakarta oro optionelles pour %{name}.
-
-%package jakarta-regexp
-Summary:        Optional jakarta regexp tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       regexp
-BuildRequires:  regexp
-Provides:       ant-jakarta-regexp = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%description jakarta-regexp
-Optional jakarta regexp tasks for %{name}.
-
-%description jakarta-regexp -l fr
-Taches jakarta regexp optionelles pour %{name}.
-
-%package javamail
-Summary:        Optional javamail tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       javamail >= 0:1.2-5jpp
-Requires:       jaf >= 0:1.0.1-5jpp
-BuildRequires:  javamail >= 0:1.2-5jpp
-BuildRequires:  jaf >= 0:1.0.1-5jpp
-Provides:       ant-javamail = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%description javamail
-Optional javamail tasks for %{name}.
-
-%description javamail -l fr
-Taches javamail optionelles pour %{name}.
-
-%package jdepend
-Summary:        Optional jdepend tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       jdepend
-BuildRequires:  jdepend
-Provides:       ant-jdepend = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%description jdepend
-Optional jdepend tasks for %{name}.
-
-%description jdepend -l fr
-Taches jdepend optionelles pour %{name}.
-
-%package jmf
-Summary:        Optional jmf tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Provides:       ant-jmf = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%description jmf
-Optional jmf tasks for %{name}.
-
-%description jmf -l fr
-Taches jmf optionelles pour %{name}.
-
-#%package jsch
-#Summary:        Optional jsch tasks for %{name}
-#Group:          Development/Build Tools
-#Requires:       %{name} = %{epoch}:%{version}-%{release}
-#Requires:       jsch
-#BuildRequires:  jsch
-#Provides:       ant-jsch = %{epoch}:%{version}-%{release}
-#Conflicts:      ant-optional-clean, ant-optional-full
-
-#%description jsch
-#Optional jsch tasks for %{name}.
-
-#%description jsch -l fr
-#Taches jsch optionelles pour %{name}.
-
-%package junit
-Summary:        Optional junit tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       junit
-BuildRequires:  junit
-Provides:       ant-junit = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%description junit
-Optional junit tasks for %{name}.
-
-%description junit -l fr
-Taches junit optionelles pour %{name}.
-
-%package nodeps
-Summary:        Optional tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Provides:       ant-nodeps = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%description nodeps
-Optional tasks for %{name}.
-
-%description nodeps -l fr
-Taches optionelles pour %{name}.
-
-%package swing
-Summary:        Optional swing tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Provides:       ant-swing = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%description swing
-Optional swing tasks for %{name}.
-
-%description swing -l fr
-Taches swing optionelles pour %{name}.
-
-%package trax
-Summary:        Optional trax tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       jaxp_transform_impl
-Provides:       ant-trax = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%description trax
-Optional trax tasks for %{name}.
-
-%description trax -l fr
-Taches trax optionelles pour %{name}.
-
-%package xalan2
-Summary:        Optional xalan2 tasks for %{name}
-Group:          Development/Build Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       xalan-j2
-BuildRequires:  xalan-j2
-Provides:       ant-xalan2 = %{epoch}:%{version}-%{release}
-Conflicts:      ant-optional-clean, ant-optional-full
-
-%description xalan2
-Optional xalan2 tasks for %{name}.
-
-%description xalan2 -l fr
-Taches xalan2 optionelles pour %{name}.
-
-%package scripts
-Summary:        Additional scripts for %{name}
-Group:          Development/Build Tools
-AutoReqProv:    no
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       /usr/bin/perl
-Requires:       /usr/bin/python
-
-%description scripts
-Additional Perl and Python scripts for %{name}.
-
-%description scripts -l fr
-Scripts additionels pour %{name}.
-
-%package manual
-Summary:        Manual for %{name}
-Group:          Development/Build Tools
-
-%description manual
-Documentation for %{name}.
-
-%description manual -l it
-Documentazione di %{name}.
-
-%description manual -l fr
-Documentation pour %{name}.
-
-%package javadoc
-Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-
-%description javadoc
-Javadoc for %{name}.
-
-%description javadoc -l fr
-Javadoc pour %{name}.
-
-# -----------------------------------------------------------------------------
-
-%prep
-%setup -q -n apache-ant-%{version}
-
-# Fix temp directory used for file containing large command strings (> 4k)
-%patch0 -p1
-
-# replace ant launch script, (may not be required for 1.6.2+)
-cp -p %{SOURCE1} src/script/%{name}
-
-# clean jar files
-find . -name "*.jar" -exec rm -f {} \;
-
-# fix classpath for java-x.y.z-gcj-compat
-if java -version 2>&1 | grep -q "gcj"; then
-%patch1 -p1
-fi
-
-# -----------------------------------------------------------------------------
-
-%build
-# classpath selects optional components to build
-#export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp xalan-j2 commons-net commons-logging jai/jai_codec jai/jai_core jsch bsf xml-commons-resolver)
-export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp xalan-j2 commons-logging bsf xml-commons-resolver)
-
-# perform bootstrap and build without jjp or user configs,
-# (except JAVA_HOME as required by build script)
-[ -n "$JAVA_HOME" ] && unset JAVA_HOME
-[ -r %{_sysconfdir}/java/java.conf ] && . %{_sysconfdir}/java/java.conf
-[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
-export JAVA_HOME
-if java -version 2>&1 | grep -q "gcj"; then
-    # make sure we do not use an installed native ant during the build
-    export ANT_OPTS="-Dgnu.gcj.runtime.VMClassLoader.library_control=never"
-fi
-sh build.sh --noconfig jars javadocs
-
-# -----------------------------------------------------------------------------
-
 %install
 rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT
+cd $RPM_BUILD_ROOT
+rpm2cpio %{SOURCE0} | cpio -id --quiet
+rm -Rf $RPM_BUILD_ROOT%{_docdir}
 
-# ANT_HOME and subdirs
-mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc}
-
-# 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}-launcher-%{version}.jar
-
-# optional jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
-cp -p build/lib/%{name}-antlr.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
-%if !%{no_bsf}
-cp -p build/lib/%{name}-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
-%endif
-cp -p build/lib/%{name}-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
-cp -p build/lib/%{name}-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
-#cp -p build/lib/%{name}-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
-#cp -p build/lib/%{name}-jai.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jai-%{version}.jar
-cp -p build/lib/%{name}-jakarta-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-bcel-%{version}.jar
-cp -p build/lib/%{name}-jakarta-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-log4j-%{version}.jar
-cp -p build/lib/%{name}-jakarta-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-oro-%{version}.jar
-cp -p build/lib/%{name}-jakarta-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-regexp-%{version}.jar
-cp -p build/lib/%{name}-javamail.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-javamail-%{version}.jar
-cp -p build/lib/%{name}-jdepend.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jdepend-%{version}.jar
-cp -p build/lib/%{name}-jmf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
-#cp -p build/lib/%{name}-jsch.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jsch-%{version}.jar
-cp -p build/lib/%{name}-junit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-junit-%{version}.jar
-cp -p build/lib/%{name}-nodeps.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
-cp -p build/lib/%{name}-swing.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-swing-%{version}.jar
-cp -p build/lib/%{name}-trax.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-trax-%{version}.jar
-cp -p build/lib/%{name}-xalan2.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xalan2-%{version}.jar
-
-# jar aliases
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
-# scripts: remove dos and os/2 scripts
-rm -f src/script/*.bat
-rm -f src/script/*.cmd
-
-# XSLs
-cp -p src/etc/*.xsl $RPM_BUILD_ROOT%{ant_home}/etc
-
-# install everything else
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-cp -p src/script/* $RPM_BUILD_ROOT%{_bindir}
-
-# default ant.conf
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
-
-# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-# fix link between manual and javadoc
-(cd docs/manual; ln -sf %{_javadocdir}/%{name}-%{version} api)
 
 # -----------------------------------------------------------------------------
 
@@ -481,345 +62,8 @@ rm -f %{_javadir}/ant-optional.jar
 
 # -----------------------------------------------------------------------------
 
-%post antlr
-if [ -f %{_sysconfdir}/%{name}.conf ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package antlr$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-    OPT_JAR_LIST="$OPT_JAR_LIST antlr ant/ant-antlr" # RPM package antlr' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-%postun antlr
-if [ "$1" = "0" ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package antlr$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-# -----------------------------------------------------------------------------
-
-%if !%{no_bsf}
-%post apache-bsf
-if [ -f %{_sysconfdir}/%{name}.conf ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package apache-bsf$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-    OPT_JAR_LIST="$OPT_JAR_LIST bsf ant/ant-apache-bsf" # RPM package apache-bsf' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-%postun apache-bsf
-if [ "$1" = "0" ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package apache-bsf$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-%endif
-
-# -----------------------------------------------------------------------------
-
-%post apache-resolver
-if [ -f %{_sysconfdir}/%{name}.conf ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package apache-resolver$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-    OPT_JAR_LIST="$OPT_JAR_LIST xml-commons-resolver ant/ant-apache-resolver" # RPM package apache-resolver' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-%postun apache-resolver
-if [ "$1" = "0" ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package apache-resolver$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-# -----------------------------------------------------------------------------
-
-%post commons-logging
-if [ -f %{_sysconfdir}/%{name}.conf ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package commons-logging$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-    OPT_JAR_LIST="$OPT_JAR_LIST jakarta-commons-logging ant/ant-commons-logging" # RPM package commons-logging' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-%postun commons-logging
-if [ "$1" = "0" ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package commons-logging$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-# -----------------------------------------------------------------------------
-
-#%post commons-net
-#if [ -f %{_sysconfdir}/%{name}.conf ]; then
-#    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-#    sed -e '/# RPM package commons-net$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-#    OPT_JAR_LIST="$OPT_JAR_LIST jakarta-commons-net ant/ant-commons-net" # RPM package commons-net' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-#    rm -f %{_sysconfdir}/%{name}.conf.tmp
-#fi
-
-#%postun commons-net
-#if [ "$1" = "0" ]; then
-#    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-#    sed -e '/# RPM package commons-net$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-#    rm -f %{_sysconfdir}/%{name}.conf.tmp
-#fi
-
-# -----------------------------------------------------------------------------
-
-#%post jai
-#if [ -f %{_sysconfdir}/%{name}.conf ]; then
-#    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-#    sed -e '/# RPM package jai$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-#    OPT_JAR_LIST="$OPT_JAR_LIST jai ant/ant-jai" # RPM package jai' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-#    rm -f %{_sysconfdir}/%{name}.conf.tmp
-#fi
-
-#%postun jai
-#if [ "$1" = "0" ]; then
-#    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-#    sed -e '/# RPM package jai$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-#    rm -f %{_sysconfdir}/%{name}.conf.tmp
-#fi
-
-# -----------------------------------------------------------------------------
-
-%post jakarta-bcel
-if [ -f %{_sysconfdir}/%{name}.conf ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package jakarta-bcel$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-    OPT_JAR_LIST="$OPT_JAR_LIST bcel ant/ant-jakarta-bcel" # RPM package jakarta-bcel' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-%postun jakarta-bcel
-if [ "$1" = "0" ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package jakarta-bcel$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-# -----------------------------------------------------------------------------
-
-%post jakarta-log4j
-if [ -f %{_sysconfdir}/%{name}.conf ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package jakarta-log4j$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-    OPT_JAR_LIST="$OPT_JAR_LIST log4j ant/ant-jakarta-log4j" # RPM package jakarta-log4j' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-%postun jakarta-log4j
-if [ "$1" = "0" ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package jakarta-log4j$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-# -----------------------------------------------------------------------------
-
-%post jakarta-oro
-if [ -f %{_sysconfdir}/%{name}.conf ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package jakarta-oro$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-    OPT_JAR_LIST="$OPT_JAR_LIST oro ant/ant-jakarta-oro" # RPM package jakarta-oro' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-%postun jakarta-oro
-if [ "$1" = "0" ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package jakarta-oro$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-# -----------------------------------------------------------------------------
-
-%post jakarta-regexp
-if [ -f %{_sysconfdir}/%{name}.conf ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package jakarta-regexp$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-    OPT_JAR_LIST="$OPT_JAR_LIST regexp ant/ant-jakarta-regexp" # RPM package jakarta-regexp' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-%postun jakarta-regexp
-if [ "$1" = "0" ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package jakarta-regexp$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-# -----------------------------------------------------------------------------
-
-%post javamail
-if [ -f %{_sysconfdir}/%{name}.conf ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package javamail$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-    OPT_JAR_LIST="$OPT_JAR_LIST javamail jaf ant/ant-javamail" # RPM package javamail' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-%postun javamail
-if [ "$1" = "0" ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package javamail$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-# -----------------------------------------------------------------------------
-
-%post jdepend
-if [ -f %{_sysconfdir}/%{name}.conf ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package jdepend$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-    OPT_JAR_LIST="$OPT_JAR_LIST jdepend ant/ant-jdepend" # RPM package jdepend' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-%postun jdepend
-if [ "$1" = "0" ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package jdepend$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-# -----------------------------------------------------------------------------
-
-%post jmf
-if [ -f %{_sysconfdir}/%{name}.conf ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package jmf$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-    OPT_JAR_LIST="$OPT_JAR_LIST ant/ant-jmf" # RPM package jmf' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-%postun jmf
-if [ "$1" = "0" ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package jmf$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-# -----------------------------------------------------------------------------
-
-#%post jsch
-#if [ -f %{_sysconfdir}/%{name}.conf ]; then
-#    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-#    sed -e '/# RPM package jsch$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-#    OPT_JAR_LIST="$OPT_JAR_LIST jsch ant/ant-jsch" # RPM package jsch' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-#    rm -f %{_sysconfdir}/%{name}.conf.tmp
-#fi
-
-#%postun jsch
-#if [ "$1" = "0" ]; then
-#    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-#    sed -e '/# RPM package jsch$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-#    rm -f %{_sysconfdir}/%{name}.conf.tmp
-#fi
-
-# -----------------------------------------------------------------------------
-
-%post junit
-if [ -f %{_sysconfdir}/%{name}.conf ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package junit$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-    OPT_JAR_LIST="$OPT_JAR_LIST junit ant/ant-junit" # RPM package junit' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-%postun junit
-if [ "$1" = "0" ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package junit$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-# -----------------------------------------------------------------------------
-
-%post nodeps
-if [ -f %{_sysconfdir}/%{name}.conf ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package nodeps$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-    OPT_JAR_LIST="$OPT_JAR_LIST ant/ant-nodeps" # RPM package nodeps' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-%postun nodeps
-if [ "$1" = "0" ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package nodeps$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-# -----------------------------------------------------------------------------
-
-%post swing
-if [ -f %{_sysconfdir}/%{name}.conf ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package swing$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-    OPT_JAR_LIST="$OPT_JAR_LIST ant/ant-swing" # RPM package swing' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-%postun swing
-if [ "$1" = "0" ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package swing$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-# -----------------------------------------------------------------------------
-
-%post trax
-if [ -f %{_sysconfdir}/%{name}.conf ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package trax$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-    OPT_JAR_LIST="$OPT_JAR_LIST jaxp_transform_impl ant/ant-trax" # RPM package trax' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-%postun trax
-if [ "$1" = "0" ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package trax$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-# -----------------------------------------------------------------------------
-
-%post xalan2
-if [ -f %{_sysconfdir}/%{name}.conf ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package xalan2$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
-    OPT_JAR_LIST="$OPT_JAR_LIST xalan-j2 ant/ant-xalan2" # RPM package xalan2' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-%postun xalan2
-if [ "$1" = "0" ]; then
-    mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
-    sed -e '/# RPM package xalan2$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
-    rm -f %{_sysconfdir}/%{name}.conf.tmp
-fi
-
-# -----------------------------------------------------------------------------
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-  rm -f %{_javadocdir}/%{name}
-fi
-
-# -----------------------------------------------------------------------------
-
 %files
 %defattr(0644,root,root,0755)
-%doc KEYS LICENSE README WHATSNEW
 %config %{_sysconfdir}/%{name}.conf
 %attr(0755,root,root) %{_bindir}/ant
 %attr(0755,root,root) %{_bindir}/antRun
@@ -835,128 +79,11 @@ fi
 %{ant_home}/etc/tagdiff.xsl
 %dir %{ant_home}/lib
 
-%files antlr
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-antlr.jar
-%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
-
-%if !%{no_bsf}
-%files apache-bsf
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-apache-bsf.jar
-%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
-%endif
-
-%files apache-resolver
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-apache-resolver.jar
-%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
-
-%files commons-logging
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-commons-logging.jar
-%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
-
-#%files commons-net
-#%defattr(0644,root,root,0755)
-#%{_javadir}/%{name}/%{name}-commons-net.jar
-#%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
-
-#%files jai
-#%defattr(0644,root,root,0755)
-#%{_javadir}/%{name}/%{name}-jai.jar
-#%{_javadir}/%{name}/%{name}-jai-%{version}.jar
-
-%files jakarta-bcel
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-jakarta-bcel.jar
-%{_javadir}/%{name}/%{name}-jakarta-bcel-%{version}.jar
-
-%files jakarta-log4j
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-jakarta-log4j.jar
-%{_javadir}/%{name}/%{name}-jakarta-log4j-%{version}.jar
-
-%files jakarta-oro
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-jakarta-oro.jar
-%{_javadir}/%{name}/%{name}-jakarta-oro-%{version}.jar
-%{ant_home}/etc/maudit-frames.xsl
-
-%files jakarta-regexp
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-jakarta-regexp.jar
-%{_javadir}/%{name}/%{name}-jakarta-regexp-%{version}.jar
-
-%files javamail
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-javamail.jar
-%{_javadir}/%{name}/%{name}-javamail-%{version}.jar
-
-%files jdepend
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-jdepend.jar
-%{_javadir}/%{name}/%{name}-jdepend-%{version}.jar
-%{ant_home}/etc/jdepend.xsl
-%{ant_home}/etc/jdepend-frames.xsl
-
-%files jmf
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-jmf.jar
-%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
-
-#%files jsch
-#%defattr(0644,root,root,0755)
-#%{_javadir}/%{name}/%{name}-jsch.jar
-#%{_javadir}/%{name}/%{name}-jsch-%{version}.jar
-
-%files junit
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-junit.jar
-%{_javadir}/%{name}/%{name}-junit-%{version}.jar
-%{ant_home}/etc/junit-frames.xsl
-%{ant_home}/etc/junit-noframes.xsl
-
-%files nodeps
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-nodeps.jar
-%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
-
-%files swing
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-swing.jar
-%{_javadir}/%{name}/%{name}-swing-%{version}.jar
-
-%files trax
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-trax.jar
-%{_javadir}/%{name}/%{name}-trax-%{version}.jar
-%{ant_home}/etc/mmetrics-frames.xsl
-%{ant_home}/etc/coverage-frames.xsl
-
-%files xalan2
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-xalan2.jar
-%{_javadir}/%{name}/%{name}-xalan2-%{version}.jar
-
-%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}/%{name}-%{version}
-
 # -----------------------------------------------------------------------------
 
 %changelog
-* Mon Oct 11 2004 Gary Benson <gbenson@redhat.com> 0:1.6.1-1jpp_3fc
-- Build into Fedora.
+* Thu Oct 14 2004 Gary Benson <gbenson@redhat.com> 0:1.6.1-1jpp_3fc
+- Bootstrap into Fedora.
 
 * Tue Jul 13 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6.1-1jpp_3rh
 - Remove incorrect noreplace option for ant.conf; it can't be used anymore
diff --git a/sources b/sources
index 2981a60..2facc16 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e1f06aae6b691543299ccb1a5cb038f  apache-ant-1.6.1-src.tar.bz2
+e8ee0098f6934c1031908154bc1c040f  ant-1.6.1-1jpp_3fc.noarch.rpm