Add license to javadoc subpackage

This commit is contained in:
Stanislav Ochotnicky 2010-07-08 14:00:34 +00:00
parent 5822ede264
commit 0d601663f2

View File

@ -4,14 +4,14 @@
Name: apache-%{short_name} Name: apache-%{short_name}
Version: 1.1.1 Version: 1.1.1
Release: 10%{?dist} Release: 11%{?dist}
Summary: Apache Commons Logging Summary: Apache Commons Logging
License: ASL 2.0 License: ASL 2.0
Group: Development/Libraries Group: Development/Libraries
URL: http://commons.apache.org/%{base_name} URL: http://commons.apache.org/%{base_name}
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Source1: %{short_name}.depmap Source1: %{short_name}.depmap
Patch1: %{short_name}-eclipse-manifest.patch Patch1: %{short_name}-eclipse-manifest.patch
Patch0: %{short_name}-maven-release-plugin.patch Patch0: %{short_name}-maven-release-plugin.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0 BuildRequires: java-devel >= 1:1.6.0
@ -74,7 +74,7 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.0.4
%patch0 -p1 -b .rhbug_588142 %patch0 -p1 -b .rhbug_588142
%patch1 %patch1
sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
@ -147,12 +147,16 @@ rm -rf $RPM_BUILD_ROOT
%files javadoc %files javadoc
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name}-%{version}
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* Thu Jul 8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-11
- Add license to javadoc subpackage
* Wed Jun 9 2010 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-10 * Wed Jun 9 2010 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-10
- Add osgi manifest entries. - Add osgi manifest entries.