- Get rid of the Provides for ant-optional and ant-optional-full.

This commit is contained in:
Permaine Cheung 2007-03-19 15:52:03 +00:00
parent 17bb9c4375
commit 1adfd456c0

View File

@ -51,7 +51,7 @@
Name: ant Name: ant
Version: 1.6.5 Version: 1.6.5
Release: %{jpprelease}.1%{?dist} Release: %{jpprelease}.2%{?dist}
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
@ -95,9 +95,7 @@ BuildArch: noarch
%endif %endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: ant-optional < %{epoch}:%{version}-%{jpprelease} Obsoletes: ant-optional < %{epoch}:%{version}-%{jpprelease}
Provides: ant-optional = %{epoch}:%{version}-%{jpprelease}
Obsoletes: ant-optional-full < %{epoch}:%{version}-%{jpprelease} Obsoletes: ant-optional-full < %{epoch}:%{version}-%{jpprelease}
Provides: ant-optional-full = %{epoch}:%{version}-%{jpprelease}
# Allow subpackages not in Fedora to be installed from JPackage # Allow subpackages not in Fedora to be installed from JPackage
Provides: %{name} = %{epoch}:%{version}-%{jpprelease} Provides: %{name} = %{epoch}:%{version}-%{jpprelease}
# RHEL3 and FC2 # RHEL3 and FC2
@ -1388,6 +1386,9 @@ fi
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* 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 * Fri Mar 16 2007 Permaine Cheung <pcheung@redhat.com> 1.6.5-4jpp.1
- Merge with upstream, get rid of the endorsed patch - Merge with upstream, get rid of the endorsed patch