Fix license tags in javadoc, manual, demo subpackages

This commit is contained in:
Michal Srb 2013-04-12 14:44:48 +02:00
parent eb1f33ef91
commit 51567104dc

View File

@ -1,7 +1,7 @@
Name: msv Name: msv
Epoch: 1 Epoch: 1
Version: 2013.2.3 Version: 2013.2.3
Release: 2%{?dist} Release: 3%{?dist}
Summary: Multi-Schema Validator Summary: Multi-Schema Validator
Group: Development/Libraries Group: Development/Libraries
License: BSD and ASL 1.1 License: BSD and ASL 1.1
@ -132,6 +132,7 @@ Obsoletes: xsdlib < %{version}-%{release}
%package javadoc %package javadoc
Summary: API documentation for Multi-Schema Validator Summary: API documentation for Multi-Schema Validator
Group: Documentation Group: Documentation
License: BSD and ASL 1.1 and ASL 2.0
Requires: java-javadoc Requires: java-javadoc
Requires: jpackage-utils Requires: jpackage-utils
Requires: isorelax-javadoc Requires: isorelax-javadoc
@ -150,6 +151,7 @@ Obsoletes: xsdlib-javadoc < %{version}-%{release}
%package manual %package manual
Summary: Manual for Multi-Schema Validator Summary: Manual for Multi-Schema Validator
Group: Documentation Group: Documentation
License: BSD
%description manual %description manual
%{summary}. %{summary}.
@ -157,6 +159,7 @@ Group: Documentation
%package demo %package demo
Summary: Samples for Multi-Schema Validator Summary: Samples for Multi-Schema Validator
Group: Documentation Group: Documentation
License: BSD
Requires: msv-msv Requires: msv-msv
Requires: msv-xsdlib Requires: msv-xsdlib
Requires: jpackage-utils Requires: jpackage-utils
@ -335,14 +338,21 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib
%files javadoc %files javadoc
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%doc License.txt
%doc msv/doc/Apache-LICENSE-1.1.txt
%doc Apache-LICENSE-2.0.txt
%files manual %files manual
%doc %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}
%doc License.txt
%files demo %files demo
%{_datadir}/%{name}-%{version} %{_datadir}/%{name}-%{version}
%changelog %changelog
* Fri Apr 12 2013 Michal Srb <msrb@redhat.com> - 1:2013.2.3-3
- Fix license tags in javadoc, manual, demo subpackages
* Fri Apr 12 2013 Michal Srb <msrb@redhat.com> - 1:2013.2.3-2 * Fri Apr 12 2013 Michal Srb <msrb@redhat.com> - 1:2013.2.3-2
- Fix license tag for msv subpackage - Fix license tag for msv subpackage
- Remove unneeded patches - Remove unneeded patches