diff --git a/ant.spec b/ant.spec index db5c458..fbcc0c5 100644 --- a/ant.spec +++ b/ant.spec @@ -1,9 +1,11 @@ %define ant_home %{_datadir}/ant %define section free +%define jpprelease 3jpp + Name: ant Version: 1.6.2 -Release: 3jpp_13fc +Release: %{jpprelease}_14fc Epoch: 0 Summary: Ant build tool for java Summary(it): Tool per la compilazione di programmi java @@ -28,8 +30,12 @@ BuildRequires: java-devel BuildRequires: coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Obsoletes: ant-optional ant-optional-full +# Allow subpackages not in Fedora to be installed from JPackage +Provides: %{name} = %{version}-%{jpprelease} # RHEL3 and FC2 Obsoletes: %{name}-libs <= 0:1.5.2, %{name}-core <= 0:1.5.2 +# FC4 +Obsoletes: %{name}-jmf <= 1.6.2-3jpp_12fc # libgcj aot-compiled native libraries BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 @@ -744,6 +750,10 @@ fi # ----------------------------------------------------------------------------- %changelog +* Wed Aug 3 2005 Gary Benson 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 0:1.6.2-3jpp_13fc - Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689).