Upgrade to 1.6.2-3jpp

This commit is contained in:
gbenson 2005-01-12 13:36:27 +00:00
parent c3f2810c47
commit 90b78ccb3a
4 changed files with 144 additions and 492 deletions

View File

@ -1,4 +1,4 @@
apache-ant-1.6.1-src.tar.bz2
apache-ant-1.6.1
apache-ant-1.6.2-src.tar.gz
apache-ant-1.6.2
noarch
*.src.rpm

608
ant.spec
View File

@ -2,8 +2,8 @@
%define section free
Name: ant
Version: 1.6.1
Release: 1jpp_7fc
Version: 1.6.2
Release: 3jpp_1fc
Epoch: 0
Summary: Ant build tool for java
Summary(it): Tool per la compilazione di programmi java
@ -13,13 +13,14 @@ 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
Source0: http://www.apache.org/dist/ant/source/apache-ant-1.6.2-src.tar.gz
# Ant configuration file which is edited when each optional subpackage
# is installed/uninstalled
Source2: apache-ant-%{version}.ant.conf
# Fix temp directory used for file containing large command strings (> 4k)
Patch0: apache-ant-%{version}.patch
Patch1: apache-ant-javac-ecj.patch
Patch1: apache-ant-%{version}-rpm.patch
Patch2: apache-ant-javac-ecj.patch
Requires: jaxp_parser_impl
Requires: jpackage-utils >= 0:1.5
# XXX make beehive play nice
@ -62,21 +63,6 @@ Optional antlr tasks for %{name}.
%description antlr -l fr
Taches antlr optionelles pour %{name}.
#%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}.
%package apache-resolver
Summary: Optional apache resolver tasks for %{name}
Group: Development/Build Tools
@ -107,95 +93,73 @@ 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}
%package apache-bcel
Summary: Optional apache bcel tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: bcel
BuildRequires: bcel
Provides: ant-apache-bcel = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-bcel = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-bcel
Conflicts: ant-optional-clean, ant-optional-full
%description jakarta-bcel
Optional jakarta bcel tasks for %{name}.
%description apache-bcel
Optional apache bcel tasks for %{name}.
%description jakarta-bcel -l fr
Taches jakarta bcel optionelles pour %{name}.
%description apache-bcel -l fr
Taches apache bcel optionelles pour %{name}.
%package jakarta-log4j
Summary: Optional jakarta log4j tasks for %{name}
%package apache-log4j
Summary: Optional apache log4j tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: log4j
BuildRequires: log4j
Provides: ant-apache-log4j = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-log4j = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-log4j
Conflicts: ant-optional-clean, ant-optional-full
%description jakarta-log4j
Optional jakarta log4j tasks for %{name}.
%description apache-log4j
Optional apache log4j tasks for %{name}.
%description jakarta-log4j -l fr
Taches jakarta log4j optionelles pour %{name}.
%description apache-log4j -l fr
Taches apache log4j optionelles pour %{name}.
%package jakarta-oro
Summary: Optional jakarta oro tasks for %{name}
%package apache-oro
Summary: Optional apache oro tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: oro
BuildRequires: oro
Provides: ant-apache-oro = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-oro = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-oro
Conflicts: ant-optional-clean, ant-optional-full
%description jakarta-oro
Optional jakarta oro tasks for %{name}.
%description apache-oro
Optional apache oro tasks for %{name}.
%description jakarta-oro -l fr
Taches jakarta oro optionelles pour %{name}.
%description apache-oro -l fr
Taches apache oro optionelles pour %{name}.
%package jakarta-regexp
Summary: Optional jakarta regexp tasks for %{name}
%package apache-regexp
Summary: Optional apache regexp tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: regexp
BuildRequires: regexp
Provides: ant-apache-regexp = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-regexp = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-regexp
Conflicts: ant-optional-clean, ant-optional-full
%description jakarta-regexp
Optional jakarta regexp tasks for %{name}.
%description apache-regexp
Optional apache regexp tasks for %{name}.
%description jakarta-regexp -l fr
Taches jakarta regexp optionelles pour %{name}.
%description apache-regexp -l fr
Taches apache regexp optionelles pour %{name}.
%package javamail
Summary: Optional javamail tasks for %{name}
@ -242,21 +206,6 @@ 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
@ -304,6 +253,8 @@ Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: jaxp_transform_impl
Provides: ant-trax = %{epoch}:%{version}-%{release}
# The ant-xalan jar has been merged into the ant-trax one
Obsoletes: ant-xalan2
Conflicts: ant-optional-clean, ant-optional-full
%description trax
@ -312,21 +263,6 @@ 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
@ -372,23 +308,23 @@ Javadoc pour %{name}.
# 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 {} \;
# Build OPT_JAR_LIST from the contents of /etc/ant.d/
%patch1 -p1
# fix classpath for java-x.y.z-gcj-compat
if java -version 2>&1 | grep -q "gcj"; then
%patch1 -p1
%patch2 -p1
rm -f src/script/ant.orig
fi
# clean jar files
find . -name "*.jar" -exec rm -f {} \;
# -----------------------------------------------------------------------------
%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)
export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-logging xml-commons-resolver)
# perform bootstrap and build without jjp or user configs,
# (except JAVA_HOME as required by build script)
@ -418,24 +354,23 @@ cp -p build/lib/%{name}-launcher.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-launcher
# 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
#cp -p build/lib/%{name}-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
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}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
cp -p build/lib/%{name}-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
cp -p build/lib/%{name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar
cp -p build/lib/%{name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
ln -sf %{name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-bcel.jar
ln -sf %{name}-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-log4j.jar
ln -sf %{name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-oro.jar
ln -sf %{name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-regexp.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)
@ -456,6 +391,23 @@ cp -p src/script/* $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
# OPT_JAR_LIST fragments
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d
echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/antlr
echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver
echo "jakarta-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-logging
echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bcel
echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-log4j
echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-oro
echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp
echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail
echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend
echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jmf
echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
echo "ant/ant-nodeps" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/nodeps
echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/swing
echo "jaxp_transform_impl ant/ant-trax" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/trax
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@ -476,329 +428,6 @@ 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
# -----------------------------------------------------------------------------
#%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
# -----------------------------------------------------------------------------
%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}
@ -826,68 +455,68 @@ fi
%{ant_home}/etc/changelog.xsl
%{ant_home}/etc/log.xsl
%{ant_home}/etc/tagdiff.xsl
%{ant_home}/etc/junit-frames-xalan1.xsl
%dir %{ant_home}/lib
%dir %{_sysconfdir}/%{name}.d
%files antlr
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-antlr.jar
%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
#%files apache-bsf
#%defattr(0644,root,root,0755)
#%{_javadir}/%{name}/%{name}-apache-bsf.jar
#%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
%{_sysconfdir}/%{name}.d/antlr
%files apache-resolver
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-resolver.jar
%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
%{_sysconfdir}/%{name}.d/apache-resolver
%files commons-logging
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-commons-logging.jar
%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
%{_sysconfdir}/%{name}.d/commons-logging
#%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
%files apache-bcel
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-bcel.jar
%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
%{_javadir}/%{name}/%{name}-jakarta-bcel.jar
%{_javadir}/%{name}/%{name}-jakarta-bcel-%{version}.jar
%{_sysconfdir}/%{name}.d/apache-bcel
%files jakarta-log4j
%files apache-log4j
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-log4j.jar
%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
%{_javadir}/%{name}/%{name}-jakarta-log4j.jar
%{_javadir}/%{name}/%{name}-jakarta-log4j-%{version}.jar
%{_sysconfdir}/%{name}.d/apache-log4j
%files jakarta-oro
%files apache-oro
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-oro.jar
%{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar
%{_javadir}/%{name}/%{name}-jakarta-oro.jar
%{_javadir}/%{name}/%{name}-jakarta-oro-%{version}.jar
%{_sysconfdir}/%{name}.d/apache-oro
%{ant_home}/etc/maudit-frames.xsl
%files jakarta-regexp
%files apache-regexp
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-regexp.jar
%{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
%{_javadir}/%{name}/%{name}-jakarta-regexp.jar
%{_javadir}/%{name}/%{name}-jakarta-regexp-%{version}.jar
%{_sysconfdir}/%{name}.d/apache-regexp
%files javamail
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-javamail.jar
%{_javadir}/%{name}/%{name}-javamail-%{version}.jar
%{_sysconfdir}/%{name}.d/javamail
%files jdepend
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-jdepend.jar
%{_javadir}/%{name}/%{name}-jdepend-%{version}.jar
%{_sysconfdir}/%{name}.d/jdepend
%{ant_home}/etc/jdepend.xsl
%{ant_home}/etc/jdepend-frames.xsl
@ -895,16 +524,13 @@ fi
%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
%{_sysconfdir}/%{name}.d/jmf
%files junit
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-junit.jar
%{_javadir}/%{name}/%{name}-junit-%{version}.jar
%{_sysconfdir}/%{name}.d/junit
%{ant_home}/etc/junit-frames.xsl
%{ant_home}/etc/junit-noframes.xsl
@ -912,24 +538,22 @@ fi
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-nodeps.jar
%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
%{_sysconfdir}/%{name}.d/nodeps
%files swing
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-swing.jar
%{_javadir}/%{name}/%{name}-swing-%{version}.jar
%{_sysconfdir}/%{name}.d/swing
%files trax
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-trax.jar
%{_javadir}/%{name}/%{name}-trax-%{version}.jar
%{_sysconfdir}/%{name}.d/trax
%{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
@ -946,30 +570,36 @@ fi
# -----------------------------------------------------------------------------
%changelog
* Wed Jan 12 2005 Gary Benson <gbenson@redhat.com> 0:1.6.1-1jpp_7fc
* Wed Jan 12 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_1fc
- Upgrade to latest version.
* Wed Jan 12 2005 Gary Benson <gbenson at redhat.com> 0:1.6.1-1jpp_7fc
- Explicitly require java-devel to make beehive play nice.
* Thu Nov 4 2004 Gary Benson <gbenson@redhat.com> 0:1.6.1-1jpp_6fc
* Mon Nov 8 2004 Gary Benson <gbenson at redhat.com> - 0:1.6.2-3jpp
- Build OPT_JAR_LIST from files in /etc/ant.d.
* Thu Nov 4 2004 Gary Benson <gbenson at redhat.com> 0:1.6.1-1jpp_6fc
- Build into Fedora.
* Mon Nov 1 2004 Gary Benson <gbenson@redhat.com> 0:1.6.1-1jpp_5fc
* Mon Nov 1 2004 Gary Benson <gbenson at redhat.com> 0:1.6.1-1jpp_5fc
- Explicitly require xerces-j2 to make beehive play nice.
* Mon Nov 1 2004 Gary Benson <gbenson@redhat.com> 0:1.6.1-1jpp_4fc
* Mon Nov 1 2004 Gary Benson <gbenson at redhat.com> 0:1.6.1-1jpp_4fc
- Bootstrap into Fedora.
* Tue Jul 13 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6.1-1jpp_3rh
* Mon Sep 06 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6.2-2jpp
- Fix to backward compatibility symbolic links.
* Wed Aug 17 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6.2-1jpp
- Update to Ant 1.6.2
* Thu Aug 05 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6.1-2jpp
- Remove incorrect noreplace option for ant.conf; it can't be used anymore
because the sub-packages update that file.
* Fri Jun 04 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6.1-1jpp_2rh
- Add patch to fix temp directory used for file containing large
command strings (> 4k)
* Thu Jun 03 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6.1-1jpp_1rh
- Red Hat customizations
- Remove commons-net, jai and jsch as we don't distribute those packages yet
* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:1.6.1-1jpp
- Extend subpackage builds to update ant.conf

22
apache-ant-1.6.2.ant.conf Normal file
View File

@ -0,0 +1,22 @@
#
# ant.conf (Ant 1.6.x)
# JPackage Project <http://www.jpackage.org/>
#
# Validate --noconfig setting in case being invoked
# from pre Ant 1.6.x environment
if [ -z "$no_config" ] ; then
no_config=true
fi
# Setup ant configuration
if $no_config ; then
# Disable RPM layout
rpm_mode=false
else
# Use RPM layout
rpm_mode=true
# ANT_HOME for rpm layout
ANT_HOME=/usr/share/ant
fi

View File

@ -1 +1 @@
3e1f06aae6b691543299ccb1a5cb038f apache-ant-1.6.1-src.tar.bz2
638b971084526823054eb3cfc94de437 apache-ant-1.6.2-src.tar.gz