Merge with upstream for upgrade
This commit is contained in:
Fernando Nasser
parent
5277cfe3f3
commit
17d6487568
385
ant.spec
385
ant.spec
@ -28,19 +28,34 @@
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
|
||||
%define _with_gcj_support 1
|
||||
%define with_manifest_only 0
|
||||
|
||||
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
|
||||
|
||||
%define with_manifest_only 0
|
||||
# Bootstrap sequence is
|
||||
# 1) rpmbuild ant --with bootstrap1 and install
|
||||
# 2) build xml-commons-apis and install
|
||||
# 3) build some jaxp_parser_impl (crimson) and install
|
||||
# 4) rpmbuild ant --with bootstrap2 and force update
|
||||
# 5) build rest of full ant BRs and install them
|
||||
# 6) rpmbuild ant (no special option) and force update
|
||||
|
||||
# build while still no jaxp_parser_impl nor xml-commons-apis available
|
||||
%define bootstrap1 %{?_with_bootstrap1:1}%{!?_with_bootstrap1:%{?_without_bootstrap1:0}%{!?_without_bootstrap1:%{?_bootstrap1:%{_bootstrap1}}%{!?_bootstrap1:0}}}
|
||||
# build core packages when xml-commons-apis and some jaxp_parser_impl available
|
||||
%define bootstrap2 %{?_with_bootstrap2:1}%{!?_with_bootstrap2:%{?_without_bootstrap2:0}%{!?_without_bootstrap2:%{?_bootstrap2:%{_bootstrap2}}%{!?_bootstrap2:0}}}
|
||||
|
||||
%define ant_home %{_datadir}/ant
|
||||
%define section free
|
||||
|
||||
%define major_version 1.7
|
||||
%define jpprelease 1jpp
|
||||
%define cvs_version 1.7.0
|
||||
|
||||
Name: ant
|
||||
Version: 1.7.0
|
||||
Release: 1jpp
|
||||
Release: %{jpprelease}.1%{?dist}
|
||||
Epoch: 0
|
||||
Summary: Ant build tool for java
|
||||
Summary(it): Tool per la compilazione di programmi java
|
||||
@ -50,36 +65,48 @@ URL: http://ant.apache.org/
|
||||
Group: Development/Build Tools
|
||||
Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.gz
|
||||
Source2: apache-ant-%{major_version}.ant.conf
|
||||
Patch1: apache-ant-1.6.5-rpm.patch
|
||||
# javah: BZ 157750
|
||||
# https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008781.html
|
||||
# https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008785.html
|
||||
# Message-ID: <432A8E37.8050101@zarb.org>
|
||||
Patch2: apache-ant-1.6.5-javah.patch
|
||||
# Fix some places where copies of classes are included in the wrong jarfiles
|
||||
Patch4: apache-ant-jars.patch
|
||||
Patch5: apache-ant-bz163689.patch
|
||||
|
||||
BuildRequires: jpackage-utils >= 0:1.5
|
||||
Requires: jaxp_parser_impl
|
||||
Requires: jpackage-utils >= 0:1.6
|
||||
Requires(pre): jpackage-utils >= 0:1.6
|
||||
Requires(postun): jpackage-utils >= 0:1.6
|
||||
Requires: java-devel
|
||||
%if ! %{bootstrap1}
|
||||
Requires: xerces-j2
|
||||
Requires: xml-commons-apis
|
||||
%endif
|
||||
BuildRequires: jpackage-utils >= 0:1.6
|
||||
BuildRequires: java-devel >= 0:1.5
|
||||
BuildRequires: coreutils
|
||||
%if ! %{bootstrap1}
|
||||
BuildRequires: jaxp_parser_impl
|
||||
BuildRequires: xml-commons-apis
|
||||
|
||||
Requires: jaxp_parser_impl
|
||||
Requires: jpackage-utils >= 0:1.5
|
||||
Requires: java-devel
|
||||
Requires: xml-commons-apis
|
||||
%endif
|
||||
|
||||
%if ! %{gcj_support}
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
Obsoletes: ant-optional ant-optional-full
|
||||
# Allow subpackages not in RHEL to be installed from JPackage
|
||||
Provides: %{name} = %{epoch}:%{version}-%{release}
|
||||
# RHUG
|
||||
Obsoletes: ant-devel
|
||||
# Mandriva
|
||||
Conflicts: j2sdk-ant
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Obsoletes: ant-optional < %{epoch}:%{version}-%{jpprelease}
|
||||
Obsoletes: ant-optional-full < %{epoch}:%{version}-%{jpprelease}
|
||||
# Allow subpackages not in Fedora to be installed from JPackage
|
||||
Provides: %{name} = %{epoch}:%{version}-%{jpprelease}
|
||||
# RHEL3 and FC2
|
||||
Obsoletes: %{name}-libs <= 0:1.5.2, %{name}-core <= 0:1.5.2
|
||||
Provides: %{name}-libs = %{epoch}:%{version}-%{jpprelease}
|
||||
Provides: %{name}-core = %{epoch}:%{version}-%{jpprelease}
|
||||
# FC4
|
||||
Obsoletes: %{name}-jmf <= 1.6.2-3jpp_12fc
|
||||
Provides: %{name}-jmf = %{epoch}:%{version}-%{jpprelease}
|
||||
|
||||
%if %{gcj_support}
|
||||
BuildRequires: java-gcj-compat-devel
|
||||
@ -125,6 +152,7 @@ Requires(postun): java-gcj-compat
|
||||
Manifest-only jars for %{name}.
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%package antlr
|
||||
Summary: Optional antlr tasks for %{name}
|
||||
Group: Development/Build Tools
|
||||
@ -145,7 +173,9 @@ Optional antlr tasks for %{name}.
|
||||
|
||||
%description antlr -l fr
|
||||
Taches antlr optionelles pour %{name}.
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%package apache-bsf
|
||||
Summary: Optional apache bsf tasks for %{name}
|
||||
Group: Development/Build Tools
|
||||
@ -166,7 +196,9 @@ Optional apache bsf tasks for %{name}.
|
||||
|
||||
%description apache-bsf -l fr
|
||||
Taches apache bsf optionelles pour %{name}.
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%package apache-resolver
|
||||
Summary: Optional apache resolver tasks for %{name}
|
||||
Group: Development/Build Tools
|
||||
@ -187,7 +219,9 @@ Optional apache resolver tasks for %{name}.
|
||||
|
||||
%description apache-resolver -l fr
|
||||
Taches apache resolver optionelles pour %{name}.
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%package commons-logging
|
||||
Summary: Optional commons logging tasks for %{name}
|
||||
Group: Development/Build Tools
|
||||
@ -208,7 +242,11 @@ Optional commons logging tasks for %{name}.
|
||||
|
||||
%description commons-logging -l fr
|
||||
Taches commons logging optionelles pour %{name}.
|
||||
%endif
|
||||
|
||||
# Disable because we don't ship the dependencies
|
||||
%if 0
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%package commons-net
|
||||
Summary: Optional commons net tasks for %{name}
|
||||
Group: Development/Build Tools
|
||||
@ -229,9 +267,8 @@ Optional commons net tasks for %{name}.
|
||||
|
||||
%description commons-net -l fr
|
||||
Taches commons net optionelles pour %{name}.
|
||||
%endif
|
||||
|
||||
# Disable because we don't ship the dependencies
|
||||
%if 0
|
||||
%package jai
|
||||
Summary: Optional jai tasks for %{name}
|
||||
Group: Development/Build Tools
|
||||
@ -254,6 +291,7 @@ Optional jai tasks for %{name}.
|
||||
Taches jai optionelles pour %{name}.
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%package apache-bcel
|
||||
Summary: Optional apache bcel tasks for %{name}
|
||||
Group: Development/Build Tools
|
||||
@ -262,7 +300,7 @@ Requires: bcel
|
||||
BuildRequires: bcel
|
||||
Provides: ant-apache-bcel = %{epoch}:%{version}-%{release}
|
||||
Provides: ant-jakarta-bcel = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: ant-jakarta-bcel
|
||||
Obsoletes: ant-jakarta-bcel < %{epoch}:%{version}-%{release}
|
||||
Conflicts: ant-optional-clean, ant-optional-full
|
||||
|
||||
%if %{gcj_support}
|
||||
@ -276,7 +314,9 @@ Optional apache bcel tasks for %{name}.
|
||||
|
||||
%description apache-bcel -l fr
|
||||
Taches apache bcel optionelles pour %{name}.
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%package apache-log4j
|
||||
Summary: Optional apache log4j tasks for %{name}
|
||||
Group: Development/Build Tools
|
||||
@ -285,7 +325,7 @@ Requires: log4j
|
||||
BuildRequires: log4j
|
||||
Provides: ant-apache-log4j = %{epoch}:%{version}-%{release}
|
||||
Provides: ant-jakarta-log4j = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: ant-jakarta-log4j
|
||||
Obsoletes: ant-jakarta-log4j < %{epoch}:%{version}-%{release}
|
||||
Conflicts: ant-optional-clean, ant-optional-full
|
||||
|
||||
%if %{gcj_support}
|
||||
@ -299,7 +339,9 @@ Optional apache log4j tasks for %{name}.
|
||||
|
||||
%description apache-log4j -l fr
|
||||
Taches apache log4j optionelles pour %{name}.
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%package apache-oro
|
||||
Summary: Optional apache oro tasks for %{name}
|
||||
Group: Development/Build Tools
|
||||
@ -308,7 +350,7 @@ Requires: oro
|
||||
BuildRequires: oro
|
||||
Provides: ant-apache-oro = %{epoch}:%{version}-%{release}
|
||||
Provides: ant-jakarta-oro = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: ant-jakarta-oro
|
||||
Obsoletes: ant-jakarta-oro < %{epoch}:%{version}-%{release}
|
||||
Conflicts: ant-optional-clean, ant-optional-full
|
||||
|
||||
%if %{gcj_support}
|
||||
@ -322,7 +364,9 @@ Optional apache oro tasks for %{name}.
|
||||
|
||||
%description apache-oro -l fr
|
||||
Taches apache oro optionelles pour %{name}.
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%package apache-regexp
|
||||
Summary: Optional apache regexp tasks for %{name}
|
||||
Group: Development/Build Tools
|
||||
@ -331,7 +375,7 @@ Requires: regexp
|
||||
BuildRequires: regexp
|
||||
Provides: ant-apache-regexp = %{epoch}:%{version}-%{release}
|
||||
Provides: ant-jakarta-regexp = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: ant-jakarta-regexp
|
||||
Obsoletes: ant-jakarta-regexp < %{epoch}:%{version}-%{release}
|
||||
Conflicts: ant-optional-clean, ant-optional-full
|
||||
|
||||
%if %{gcj_support}
|
||||
@ -345,7 +389,9 @@ Optional apache regexp tasks for %{name}.
|
||||
|
||||
%description apache-regexp -l fr
|
||||
Taches apache regexp optionelles pour %{name}.
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%package javamail
|
||||
Summary: Optional javamail tasks for %{name}
|
||||
Group: Development/Build Tools
|
||||
@ -368,7 +414,9 @@ Optional javamail tasks for %{name}.
|
||||
|
||||
%description javamail -l fr
|
||||
Taches javamail optionelles pour %{name}.
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%package jdepend
|
||||
Summary: Optional jdepend tasks for %{name}
|
||||
Group: Development/Build Tools
|
||||
@ -389,6 +437,7 @@ Optional jdepend tasks for %{name}.
|
||||
|
||||
%description jdepend -l fr
|
||||
Taches jdepend optionelles pour %{name}.
|
||||
%endif
|
||||
|
||||
%package jmf
|
||||
Summary: Optional jmf tasks for %{name}
|
||||
@ -409,6 +458,7 @@ Optional jmf tasks for %{name}.
|
||||
%description jmf -l fr
|
||||
Taches jmf optionelles pour %{name}.
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%package jsch
|
||||
Summary: Optional jsch tasks for %{name}
|
||||
Group: Development/Build Tools
|
||||
@ -429,7 +479,9 @@ Optional jsch tasks for %{name}.
|
||||
|
||||
%description jsch -l fr
|
||||
Taches jsch optionelles pour %{name}.
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%package junit
|
||||
Summary: Optional junit tasks for %{name}
|
||||
Group: Development/Build Tools
|
||||
@ -450,6 +502,7 @@ Optional junit tasks for %{name}.
|
||||
|
||||
%description junit -l fr
|
||||
Taches junit optionelles pour %{name}.
|
||||
%endif
|
||||
|
||||
%package nodeps
|
||||
Summary: Optional tasks for %{name}
|
||||
@ -496,7 +549,8 @@ 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
|
||||
Obsoletes: ant-xalan2 < %{epoch}:%{version}-%{release}
|
||||
Provides: ant-xalan2 = %{epoch}:%{version}-%{release}
|
||||
Conflicts: ant-optional-clean, ant-optional-full
|
||||
|
||||
%if %{gcj_support}
|
||||
@ -516,7 +570,6 @@ 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
|
||||
@ -541,8 +594,6 @@ Documentation pour %{name}.
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
Group: Development/Documentation
|
||||
Requires(post): /bin/rm,/bin/ln
|
||||
Requires(postun): /bin/rm
|
||||
|
||||
%description javadoc
|
||||
Javadoc for %{name}.
|
||||
@ -555,13 +606,19 @@ Javadoc pour %{name}.
|
||||
%prep
|
||||
%setup -q -n apache-ant-%{cvs_version}
|
||||
|
||||
# Build OPT_JAR_LIST from the contents of /etc/ant.d/
|
||||
%patch1 -p1
|
||||
|
||||
# #157750: make the javah task work with java-gcj-compat
|
||||
%patch2 -p1
|
||||
|
||||
# Fix some places where copies of classes are included in the wrong jarfiles
|
||||
%patch4 -p1 -b .orig
|
||||
|
||||
# Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689).
|
||||
%ifarch ppc64 s390x
|
||||
%patch5 -p1 -b .orig
|
||||
%endif
|
||||
#%ifarch ppc64 s390x
|
||||
#%patch5 -p1 -b .orig
|
||||
#%endif
|
||||
|
||||
# clean jar files
|
||||
find . -name "*.jar" -exec rm -f {} \;
|
||||
@ -608,16 +665,17 @@ cp -p build/lib/%{name}-weblogic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-
|
||||
cp -p build/lib/%{name}-xalan1.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xalan1-%{version}.jar
|
||||
cp -p build/lib/%{name}-xslp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xslp-%{version}.jar
|
||||
%endif
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
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}-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}-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
|
||||
cp -p build/lib/%{name}-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-resolver-%{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
|
||||
@ -627,6 +685,7 @@ cp -p build/lib/%{name}-jdepend.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-j
|
||||
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
|
||||
%endif
|
||||
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
|
||||
@ -641,6 +700,13 @@ rm -f src/script/*.cmd
|
||||
|
||||
# XSLs
|
||||
cp -p src/etc/*.xsl $RPM_BUILD_ROOT%{ant_home}/etc
|
||||
%if %{bootstrap1} || %{bootstrap2}
|
||||
rm -f $RPM_BUILD_ROOT%{ant_home}/etc/jdepend-frames.xsl
|
||||
rm -f $RPM_BUILD_ROOT%{ant_home}/etc/jdepend.xsl
|
||||
rm -f $RPM_BUILD_ROOT%{ant_home}/etc/junit-frames.xsl
|
||||
rm -f $RPM_BUILD_ROOT%{ant_home}/etc/junit-noframes.xsl
|
||||
rm -f $RPM_BUILD_ROOT%{ant_home}/etc/maudit-frames.xsl
|
||||
%endif
|
||||
|
||||
# install everything else
|
||||
mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
||||
@ -652,11 +718,11 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
|
||||
|
||||
# OPT_JAR_LIST fragments
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/antlr
|
||||
echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bsf
|
||||
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 "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
|
||||
#echo "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
|
||||
#echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jai
|
||||
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
|
||||
@ -664,9 +730,11 @@ echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-o
|
||||
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 "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
|
||||
echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
|
||||
echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver
|
||||
%endif
|
||||
echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jmf
|
||||
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
|
||||
@ -674,6 +742,7 @@ echo "jaxp_transform_impl ant/ant-trax" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.
|
||||
# javadoc
|
||||
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
||||
cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
||||
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
|
||||
# fix link between manual and javadoc
|
||||
(cd docs/manual; ln -sf %{_javadocdir}/%{name}-%{version} api)
|
||||
@ -689,17 +758,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%post javadoc
|
||||
rm -f %{_javadocdir}/%{name}
|
||||
ln -s %{name}-%{version} %{_javadocdir}/%{name}
|
||||
|
||||
%postun javadoc
|
||||
if [ "$1" = "0" ]; then
|
||||
rm -f %{_javadocdir}/%{name}
|
||||
fi
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%if %{gcj_support}
|
||||
%post
|
||||
if [ -x %{_bindir}/rebuild-gcj-db ]
|
||||
@ -716,6 +774,8 @@ then
|
||||
fi
|
||||
%endif
|
||||
|
||||
# We do not ship dependencies for these, so they are disabled.
|
||||
%if 0
|
||||
%if %{gcj_support}
|
||||
%post commons-net
|
||||
if [ -x %{_bindir}/rebuild-gcj-db ]
|
||||
@ -732,8 +792,6 @@ then
|
||||
fi
|
||||
%endif
|
||||
|
||||
# We do not ship dependencies for these, so they are disabled.
|
||||
%if 0
|
||||
%if %{gcj_support}
|
||||
%post jai
|
||||
if [ -x %{_bindir}/rebuild-gcj-db ]
|
||||
@ -1010,7 +1068,7 @@ fi
|
||||
%files
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc KEYS LICENSE NOTICE README WHATSNEW
|
||||
%config %{_sysconfdir}/%{name}.conf
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.conf
|
||||
%attr(0755,root,root) %{_bindir}/ant
|
||||
%attr(0755,root,root) %{_bindir}/antRun
|
||||
%{_javadir}/%{name}.jar
|
||||
@ -1056,68 +1114,78 @@ fi
|
||||
%{_javadir}/%{name}/ant-xslp.jar
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%files antlr
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}/%{name}-antlr.jar
|
||||
%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
|
||||
%{_sysconfdir}/%{name}.d/antlr
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/antlr
|
||||
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-antlr-1.6.5.jar.*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%files apache-bsf
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}/%{name}-apache-bsf.jar
|
||||
%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
|
||||
%{_sysconfdir}/%{name}.d/apache-bsf
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bsf
|
||||
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bsf-1.6.5.jar.*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%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
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-resolver
|
||||
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-resolver-1.6.5.jar.*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%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
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/commons-logging
|
||||
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-logging-1.6.5.jar.*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# Disable as we dont ship the dependencies
|
||||
%if 0
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%files commons-net
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}/%{name}-commons-net.jar
|
||||
%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
|
||||
%{_sysconfdir}/%{name}.d/commons-net
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/commons-net
|
||||
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-net-1.6.5.jar.*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# Disable as we dont ship the dependencies
|
||||
%if 0
|
||||
%files jai
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}/%{name}-jai.jar
|
||||
%{_javadir}/%{name}/%{name}-jai-%{version}.jar
|
||||
%{_sysconfdir}/%{name}.d/jai
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/jai
|
||||
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
@ -1125,71 +1193,82 @@ fi
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%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
|
||||
%{_sysconfdir}/%{name}.d/apache-bcel
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel
|
||||
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bcel-1.6.5.jar.*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%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
|
||||
%{_sysconfdir}/%{name}.d/apache-log4j
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j
|
||||
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-log4j-1.6.5.jar.*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%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
|
||||
%{_sysconfdir}/%{name}.d/apache-oro
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro
|
||||
%{ant_home}/etc/maudit-frames.xsl
|
||||
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-oro-1.6.5.jar.*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%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
|
||||
%{_sysconfdir}/%{name}.d/apache-regexp
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-regexp
|
||||
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-regexp-1.6.5.jar.*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%files javamail
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}/%{name}-javamail.jar
|
||||
%{_javadir}/%{name}/%{name}-javamail-%{version}.jar
|
||||
%{_sysconfdir}/%{name}.d/javamail
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/javamail
|
||||
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-javamail-1.6.5.jar.*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%files jdepend
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}/%{name}-jdepend.jar
|
||||
%{_javadir}/%{name}/%{name}-jdepend-%{version}.jar
|
||||
%{_sysconfdir}/%{name}.d/jdepend
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/jdepend
|
||||
%{ant_home}/etc/jdepend.xsl
|
||||
%{ant_home}/etc/jdepend-frames.xsl
|
||||
|
||||
@ -1197,34 +1276,38 @@ fi
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jdepend-1.6.5.jar.*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%files jmf
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}/%{name}-jmf.jar
|
||||
%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
|
||||
%{_sysconfdir}/%{name}.d/jmf
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/jmf
|
||||
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jmf-1.6.5.jar.*
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%files jsch
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}/%{name}-jsch.jar
|
||||
%{_javadir}/%{name}/%{name}-jsch-%{version}.jar
|
||||
%{_sysconfdir}/%{name}.d/jsch
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/jsch
|
||||
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jsch-1.6.5.jar.*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if ! %{bootstrap1} && ! %{bootstrap2}
|
||||
%files junit
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}/%{name}-junit.jar
|
||||
%{_javadir}/%{name}/%{name}-junit-%{version}.jar
|
||||
%{_sysconfdir}/%{name}.d/junit
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/junit
|
||||
%{ant_home}/etc/junit-frames.xsl
|
||||
%{ant_home}/etc/junit-noframes.xsl
|
||||
|
||||
@ -1232,12 +1315,13 @@ fi
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-junit-1.6.5.jar.*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%files nodeps
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}/%{name}-nodeps.jar
|
||||
%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
|
||||
%{_sysconfdir}/%{name}.d/nodeps
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/nodeps
|
||||
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
@ -1248,7 +1332,7 @@ fi
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}/%{name}-swing.jar
|
||||
%{_javadir}/%{name}/%{name}-swing-%{version}.jar
|
||||
%{_sysconfdir}/%{name}.d/swing
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/swing
|
||||
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
|
||||
@ -1259,7 +1343,7 @@ fi
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}/%{name}-trax.jar
|
||||
%{_javadir}/%{name}/%{name}-trax-%{version}.jar
|
||||
%{_sysconfdir}/%{name}.d/trax
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.d/trax
|
||||
%{ant_home}/etc/mmetrics-frames.xsl
|
||||
%{ant_home}/etc/coverage-frames.xsl
|
||||
|
||||
@ -1280,22 +1364,89 @@ fi
|
||||
%files javadoc
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadocdir}/%{name}-%{version}
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Fri Jul 27 2007 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-1jpp.1
|
||||
- Merge with upstream for upgrade
|
||||
|
||||
* Wed Jun 20 2007 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-1jpp
|
||||
- Upgrade to the final 1.7.0
|
||||
|
||||
* Wed Apr 25 2007 Permaine Cheung <pcheung@redhat.com> 0:1.6.5-4jpp.3
|
||||
- Update spec file as per fedora review.
|
||||
|
||||
* Mon Mar 19 2007 Permaine Cheung <pcheung@redhat.com> 1.6.5-4jpp.2
|
||||
- Get rid of the Provides for ant-optional and ant-optional-full.
|
||||
|
||||
* Fri Mar 16 2007 Permaine Cheung <pcheung@redhat.com> 1.6.5-4jpp.1
|
||||
- Merge with upstream, get rid of the endorsed patch
|
||||
|
||||
* Tue Feb 20 2007 Permaine Cheung <pcheung@redhat.com> 1.6.5-2jpp.3
|
||||
- Add endorsed dir and create symlinks for xml-commons-apis and
|
||||
jaxp_parser_impl there, and add the option when running ant.
|
||||
- Add missing BR
|
||||
- Fix some rpmlint issues
|
||||
|
||||
* Fri Feb 09 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.6.5-4jpp
|
||||
- Must skip release 3 because Youri::Bugzilla::_add_version doesn't
|
||||
distinguish between JPP-1.6 and JPP-1.7 and we have 1.6.5-3 in 1.6
|
||||
|
||||
* Fri Feb 09 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.6.5-3jpp
|
||||
- Added option "bootstrap1" for building core while no jaxp_parser_impl
|
||||
nor xml-commons-apis available
|
||||
- Added option "bootstrap2" for building core when some jaxp_parser_impl
|
||||
and xml-commons-apis available
|
||||
|
||||
* Thu Sep 21 2006 Will Tatam <will.tatam@red61.com> - 0:1.7.0-0.Beta1.1jpp
|
||||
- Upgraded to 1.7.0Beta1
|
||||
- removed the apache-ant-1.6.5-jvm1.5-detect.patch as merged upstream
|
||||
|
||||
* Fri Aug 11 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.6.5-2jpp
|
||||
* Wed Aug 30 2006 Deepak Bhole <dbhole@redhat.com> 1.6.5-2jpp.2
|
||||
- Re-enabling style and xmlvalidate task on ppc64 and s390x.
|
||||
|
||||
* Fri Aug 11 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.6.5-2jpp.1
|
||||
- Added conditional native compilation
|
||||
- Added patch to fix jvm version detection
|
||||
- Add missing requirements
|
||||
- Synch with Fedora spec
|
||||
- Synch with JPackage spec
|
||||
|
||||
* Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:1.6.5-1jpp_11fc
|
||||
- Rebuilt
|
||||
|
||||
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0:1.6.5-1jpp_10fc
|
||||
- rebuild
|
||||
|
||||
* Thu Jun 1 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.6.5-1jpp_9fc
|
||||
- actually apply the patch added in 8fc!
|
||||
|
||||
* Thu Jun 1 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.6.5-1jpp_8fc
|
||||
- Added patch to fix jvm version detection
|
||||
|
||||
* Mon Mar 6 2006 Jeremy Katz <katzj@redhat.com> - 0:1.6.5-1jpp_7fc
|
||||
- stop scriptlet spew
|
||||
|
||||
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0:1.6.5-1jpp_6fc
|
||||
- bump again for double-long bug on ppc(64)
|
||||
|
||||
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 0:1.6.5-1jpp_5fc
|
||||
- rebuilt for new gcc4.1 snapshot and glibc changes
|
||||
|
||||
* Thu Feb 2 2006 Archit Shah <ashah@redhat.com> - 0:1.6.5-1jpp_4fc
|
||||
- build ant without using native code
|
||||
|
||||
* Mon Jan 9 2006 Jesse Keating <jkeating@redhat.com> - 0:1.6.5-1jpp_3fc
|
||||
- bump again for another gcj fix
|
||||
|
||||
* Wed Dec 21 2005 Jesse Keating <jkeating@redhat.com> - 0:1.6.5-1jpp_2fc
|
||||
- rebuilt again
|
||||
|
||||
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Fri Dec 9 2005 Jesse Keating <jkeating@redhat.com> - 0:1.6.5-1jpp_1fc
|
||||
- rebuild for gcc-4.1.0-0.6
|
||||
|
||||
* Wed Nov 09 2005 Fernando Nasser <fnasser at redhat.com> - 0:1.6.5-1jpp
|
||||
- Upgrade to 1.6.5
|
||||
@ -1310,9 +1461,97 @@ fi
|
||||
- Add manifest-only package (mainly for eclipse)
|
||||
- Add conflicts on j2sdk for Mandriva
|
||||
|
||||
* Tue Nov 8 2005 Vadim Nasardinov <vadimn@redhat.com> - 0:1.6.5-0jpp_1fc
|
||||
- Converted from ISO-8859-1 to UTF-8. (The correct encoding was
|
||||
somehow lost in going from version 1.58 to 1.59.)
|
||||
|
||||
* Thu Nov 3 2005 Vadim Nasardinov <vadimn@redhat.com> - 0:1.6.5-0jpp_1fc
|
||||
- Changed the Release from 2fc to 0jpp_1fc on the assumption that we
|
||||
are going to want to resync this package with JPackage if/when the
|
||||
latter releases ant-1.6.5-1jpp.
|
||||
|
||||
* Tue Nov 1 2005 Vadim Nasardinov <vadimn@redhat.com> - 0:1.6.5-2fc
|
||||
- Removed .jar files from upstream source
|
||||
|
||||
* Mon Oct 31 2005 Vadim Nasardinov <vadimn@redhat.com> - 0:1.6.5-1fc
|
||||
- Upgraded to 1.6.5
|
||||
- Removed apache-ant-1.6.2.patch. It was no longer relevant due to the
|
||||
following change upstream:
|
||||
src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v1.41.2.8
|
||||
- Updated apache-ant-1.6.2-rpm.patch to apache-ant-1.6.5-rpm.patch
|
||||
- Replaced apache-ant-bz157750.patch with apache-ant-1.6.5-javah.patch
|
||||
- Converted this spec file from iso-8859-1 to utf-8. (#159586)
|
||||
|
||||
* Wed Aug 3 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_14fc
|
||||
- Allow subpackages not in Fedora to be installed from JPackage.
|
||||
- Obsolete the jmf subpackage (#164389).
|
||||
|
||||
* Thu Jul 21 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_13fc
|
||||
- Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689).
|
||||
|
||||
* Mon Jul 18 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_12fc
|
||||
- Built on ia64, ppc64, s390 and s390x.
|
||||
- Switch to aot-compile-rpm (also BC-compiles subpackages).
|
||||
- Remove the jmf subpackage since it wasn't being built anyway.
|
||||
|
||||
* Fri Jul 15 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_11fc
|
||||
- Bootstrap onto ia64, ppc64, s390 and s390x.
|
||||
|
||||
* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_10fc
|
||||
- Add the bsf subpackage since we now ship bsf.
|
||||
- Remove gcj workaround (not correct, so assume not necessary).
|
||||
- Remove jarfiles from the tarball.
|
||||
|
||||
* Mon Jun 6 2005 Gary Benson <gbenson at redhat.com>
|
||||
- Make the javah task fall back to executing javah if
|
||||
com.sun.tools.javah.Main cannot be found.
|
||||
|
||||
* Tue May 25 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_9fc
|
||||
- Rearrange how BC-compiled stuff is built and installed.
|
||||
|
||||
* Mon May 23 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_8fc
|
||||
- Use absolute paths for rebuild-gcj-db.
|
||||
|
||||
* Mon May 23 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_7fc
|
||||
- Build the javah task (#157750).
|
||||
- Add alpha to the list of build architectures (#157522).
|
||||
|
||||
* Thu May 5 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_6fc
|
||||
- Add dependencies for post and postun scriptlets (#156901).
|
||||
|
||||
* Fri Apr 29 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_5fc
|
||||
- BC-compile the two core jars.
|
||||
- Own /usr/share/java/ant.
|
||||
|
||||
* Fri Apr 08 2005 Andrew Overholt <overholt at redhat.com> 0:1.6.2-3jpp_4fc
|
||||
- Replace gcj workarounds removed in previous commit.
|
||||
|
||||
* Tue Mar 29 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_3fc
|
||||
- Add NOTICE file as per Apache License version 2.0.
|
||||
- Remove some now unnecessary gcj workarounds.
|
||||
- Add the jsch subpackage since we now ship jsch.
|
||||
|
||||
* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_2fc
|
||||
- Use jdtcore.jar instead of ecj.jar when running under libgcj.
|
||||
|
||||
* 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.
|
||||
|
||||
* 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 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 at redhat.com> 0:1.6.1-1jpp_4fc
|
||||
- Bootstrap into Fedora.
|
||||
|
||||
* Mon Sep 06 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6.2-2jpp
|
||||
- Fix to backward compatibility symbolic links.
|
||||
|
||||
@ -1331,7 +1570,7 @@ fi
|
||||
* Tue Mar 23 2004 Randy Watler <rwatler at finali.com> - 0:1.6.1-1jpp
|
||||
- Update to Ant 1.6.1
|
||||
- Change ant launch script to source instead of patch
|
||||
- Move optional components to ant subdirectory: %{_javadir}/%{name}
|
||||
- Move optional components to ant subdirectory: {_javadir}/{name}
|
||||
- Remove os/2 scripts and set JAVA_HOME for build
|
||||
|
||||
* Wed Feb 11 2004 Randy Watler <rwatler at finali.com> - 0:1.6.0-1jpp
|
||||
@ -1476,7 +1715,7 @@ fi
|
||||
matching package
|
||||
- added jdepend 2.2
|
||||
- remove require oro, since ant could works without it
|
||||
- ant lib is now in %{_javadir}/%{name}, put external jars here
|
||||
- ant lib is now in {_javadir}/{name}, put external jars here
|
||||
|
||||
* Tue May 07 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.4.1-12jpp
|
||||
- hardcoded distribution and vendor tag
|
||||
|
||||
Loading…
Reference in New Issue
Block a user