Avoid conflicts between different versions of packages
Remove duplicate files from the -doc subpackage and make it depend on the base package (intentionally without %{_isa} since any base package of the same version ships the same license files). Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
This commit is contained in:
parent
7393454a2f
commit
c57ecf7441
@ -169,6 +169,10 @@ Header files for applications that use %{name}.
|
|||||||
%package doc
|
%package doc
|
||||||
Summary: User documentation for the %{name} package
|
Summary: User documentation for the %{name} package
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
# Depend on one of the base packages because they have the license files
|
||||||
|
# We cannot just bundle them into doc because they might conflict with an
|
||||||
|
# older or newer version of the base package.
|
||||||
|
Requires: %{name} == %{version}-%{release}
|
||||||
|
|
||||||
%description doc
|
%description doc
|
||||||
User documentation for %{name}.
|
User documentation for %{name}.
|
||||||
@ -424,8 +428,9 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%doc %{_pkgdocdir}
|
%doc %{_pkgdocdir}/html
|
||||||
%license %{_datadir}/licenses/%{name}*
|
%doc %{_pkgdocdir}/%{name}.pdf
|
||||||
|
%doc %{_pkgdocdir}/%{name}.ps
|
||||||
|
|
||||||
|
|
||||||
%if %{with replace_coreutils}
|
%if %{with replace_coreutils}
|
||||||
|
Loading…
Reference in New Issue
Block a user