Remove legacy Obsoletes/Provides for jakarta-commons
This commit is contained in:
parent
d7d1010ec1
commit
5623db3cab
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: apache-%{short_name}
|
Name: apache-%{short_name}
|
||||||
Version: 1.9
|
Version: 1.9
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: Implementations of common encoders and decoders
|
Summary: Implementations of common encoders and decoders
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://commons.apache.org/%{base_name}/
|
URL: http://commons.apache.org/%{base_name}/
|
||||||
@ -18,15 +18,6 @@ BuildRequires: maven-local
|
|||||||
BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
|
BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
|
||||||
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
|
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
|
||||||
|
|
||||||
# It looks like there are packages in F-18 that BR/R the short name
|
|
||||||
Provides: %{short_name} = %{version}-%{release}
|
|
||||||
Obsoletes: %{short_name} < %{version}-%{release}
|
|
||||||
# Provide and obsolete jakarta-commons-codec to support installing this
|
|
||||||
# package on RHEL 6, which still uses the old jakarta-commons-* package
|
|
||||||
# naming scheme.
|
|
||||||
Provides: jakarta-%{short_name} = %{version}-%{release}
|
|
||||||
Obsoletes: jakarta-%{short_name} < %{version}-%{release}
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Commons Codec is an attempt to provide definitive implementations of
|
Commons Codec is an attempt to provide definitive implementations of
|
||||||
commonly used encoders and decoders. Examples include Base64, Hex,
|
commonly used encoders and decoders. Examples include Base64, Hex,
|
||||||
@ -34,8 +25,6 @@ Phonetic and URLs.
|
|||||||
|
|
||||||
%package javadoc
|
%package javadoc
|
||||||
Summary: API documentation for %{name}
|
Summary: API documentation for %{name}
|
||||||
Provides: jakarta-%{short_name}-javadoc = %{version}-%{release}
|
|
||||||
Obsoletes: jakarta-%{short_name}-javadoc < %{version}-%{release}
|
|
||||||
|
|
||||||
%description javadoc
|
%description javadoc
|
||||||
%{summary}.
|
%{summary}.
|
||||||
@ -61,6 +50,9 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt
|
|||||||
%doc LICENSE.txt NOTICE.txt aspell-mail.txt
|
%doc LICENSE.txt NOTICE.txt aspell-mail.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 14 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9-5
|
||||||
|
- Remove legacy Obsoletes/Provides for jakarta-commons
|
||||||
|
|
||||||
* Wed Jul 30 2014 Mat Booth <mat.booth@redhat.com> - 1.9-4
|
* Wed Jul 30 2014 Mat Booth <mat.booth@redhat.com> - 1.9-4
|
||||||
- Fix incorrect parent BR causing FTBFS
|
- Fix incorrect parent BR causing FTBFS
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user