rpms/apache-commons-logging/devel apache-commons-logging.spec, 1.5, 1.6

[Stanislav Ochotnicky]

Author: sochotni

Update of /cvs/pkgs/rpms/apache-commons-logging/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9359

Modified Files:
	apache-commons-logging.spec 
Log Message:
Add obsoletes to javadoc subpackage




Index: apache-commons-logging.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apache-commons-logging/devel/apache-commons-logging.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- apache-commons-logging.spec	12 May 2010 07:37:03 -0000	1.5
+++ apache-commons-logging.spec	12 May 2010 12:21:12 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -42,15 +42,15 @@ Requires(postun):jpackage-utils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 # This should go away with F-17
-Provides:       jakarta-commons-logging = 0:%{version}-%{release}
-Obsoletes:      jakarta-commons-logging <= 0:1.0.4
+Provides:       jakarta-%{short_name} = 0:%{version}-%{release}
+Obsoletes:      jakarta-%{short_name} <= 0:1.0.4
 
 %description
 The commons-logging package provides a simple, component oriented
 interface (org.apache.commons.logging.Log) together with wrappers for
 logging systems. The user can choose at runtime which system they want
 to use. In addition, a small number of basic implementations are
-provided to allow users to use the package standalone. 
+provided to allow users to use the package standalone.
 commons-logging was heavily influenced by Avalon's Logkit and Log4J. The
 commons-logging abstraction is meant to minimize the differences between
 the two, and to allow a developer to not tie himself to a particular
@@ -61,6 +61,7 @@ Summary:        API documentation for %{
 Group:          Documentation
 Requires:       jpackage-utils
 
+Obsoletes:      jakarta-%{short_name}-javadoc <= 0:1.0.4
 
 %description    javadoc
 %{summary}.
@@ -149,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed May 12 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.1.1-8
+- Add obsoletes to javadoc subpackage
+
 * Wed May 12 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.1.1-7
 - Fix symlink problems introduced previously in r5