Add obsoletes to javadoc subpackage

This commit is contained in:
Stanislav Ochotnicky 2010-05-12 12:21:12 +00:00
parent cd4e9a39d7
commit 9a97dacbb4

View File

@ -4,7 +4,7 @@
Name: apache-%{short_name} Name: apache-%{short_name}
Version: 1.1.1 Version: 1.1.1
Release: 7%{?dist} Release: 8%{?dist}
Summary: Apache Commons Logging Summary: Apache Commons Logging
License: ASL 2.0 License: ASL 2.0
Group: Development/Libraries Group: Development/Libraries
@ -42,8 +42,8 @@ Requires(postun):jpackage-utils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
# This should go away with F-17 # This should go away with F-17
Provides: jakarta-commons-logging = 0:%{version}-%{release} Provides: jakarta-%{short_name} = 0:%{version}-%{release}
Obsoletes: jakarta-commons-logging <= 0:1.0.4 Obsoletes: jakarta-%{short_name} <= 0:1.0.4
%description %description
The commons-logging package provides a simple, component oriented The commons-logging package provides a simple, component oriented
@ -61,6 +61,7 @@ Summary: API documentation for %{name}
Group: Documentation Group: Documentation
Requires: jpackage-utils Requires: jpackage-utils
Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.0.4
%description javadoc %description javadoc
%{summary}. %{summary}.
@ -149,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* Wed May 12 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-8
- Add obsoletes to javadoc subpackage
* Wed May 12 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-7 * Wed May 12 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-7
- Fix symlink problems introduced previously in r5 - Fix symlink problems introduced previously in r5