Merge changes from bootstrap2-branch
This commit is contained in:
parent
88c5a67791
commit
9a0ca7ca49
10
ant.spec
10
ant.spec
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: ant
|
Name: ant
|
||||||
Version: 1.6.2
|
Version: 1.6.2
|
||||||
Release: 3jpp_10fc
|
Release: 3jpp_11fc
|
||||||
Epoch: 0
|
Epoch: 0
|
||||||
Summary: Ant build tool for java
|
Summary: Ant build tool for java
|
||||||
Summary(it): Tool per la compilazione di programmi java
|
Summary(it): Tool per la compilazione di programmi java
|
||||||
@ -12,8 +12,6 @@ License: Apache Software License
|
|||||||
URL: http://ant.apache.org/
|
URL: http://ant.apache.org/
|
||||||
Group: Development/Build Tools
|
Group: Development/Build Tools
|
||||||
Source0: apache-ant-1.6.2-src-RHCLEAN.tar.bz2
|
Source0: apache-ant-1.6.2-src-RHCLEAN.tar.bz2
|
||||||
# Ant configuration file which is edited when each optional subpackage
|
|
||||||
# is installed/uninstalled
|
|
||||||
Source2: apache-ant-%{version}.ant.conf
|
Source2: apache-ant-%{version}.ant.conf
|
||||||
# Fix temp directory used for file containing large command strings (> 4k)
|
# Fix temp directory used for file containing large command strings (> 4k)
|
||||||
Patch0: apache-ant-%{version}.patch
|
Patch0: apache-ant-%{version}.patch
|
||||||
@ -34,7 +32,6 @@ Obsoletes: %{name}-libs <= 0:1.5.2, %{name}-core <= 0:1.5.2
|
|||||||
BuildRequires: gcc-java >= 4.0.0-0.43
|
BuildRequires: gcc-java >= 4.0.0-0.43
|
||||||
BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
|
BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
|
||||||
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
|
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
|
||||||
ExclusiveArch: %{ix86} x86_64 ppc alpha
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Ant is a platform-independent build tool for java. It's used by apache
|
Ant is a platform-independent build tool for java. It's used by apache
|
||||||
@ -629,7 +626,7 @@ fi
|
|||||||
%files scripts
|
%files scripts
|
||||||
%defattr(0755,root,root,0755)
|
%defattr(0755,root,root,0755)
|
||||||
%{_bindir}/*.pl
|
%{_bindir}/*.pl
|
||||||
%{_bindir}/*.py
|
%{_bindir}/*.py*
|
||||||
|
|
||||||
%files manual
|
%files manual
|
||||||
%defattr(0644,root,root,0755)
|
%defattr(0644,root,root,0755)
|
||||||
@ -642,6 +639,9 @@ fi
|
|||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* 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.
|
- Add the bsf subpackage since we now ship bsf.
|
||||||
- Remove gcj workaround (not correct, so assume not necessary).
|
- Remove gcj workaround (not correct, so assume not necessary).
|
||||||
|
Loading…
Reference in New Issue
Block a user