Split out wayland-doc subpackage for documentation

Instead of using a confusingly named 'wayland' subpackage just for
shipping development documentation, put it in 'wayland-doc' and drop the
'wayland' subpackage.

As a side effect, this also fixes the build on F24 with rpm 4.12.90
which would otherwise fail with:

RPM build errors:
    Macro expanded in comment on line 123: #doc %{_datadir}/doc/wayland/*
    Installed (but unpackaged) file(s) found:
   /usr/share/doc/wayland/Wayland/en-US/html/Wayland.proc
   /usr/share/doc/wayland/Wayland/en-US/html/apa.html
   [snip, hundreds of documentation files cut out]
This commit is contained in:
Kalev Lember 2015-08-21 17:43:29 +02:00
parent 92d240df24
commit 36152094f0

View File

@ -2,7 +2,7 @@
Name: wayland
Version: 1.8.91
Release: 1%{?gitdate:.%{gitdate}}%{?dist}
Release: 2%{?gitdate:.%{gitdate}}%{?dist}
Summary: Wayland Compositor Infrastructure
Group: User Interface/X
@ -25,9 +25,6 @@ BuildRequires: docbook-style-xsl
BuildRequires: xmlto
BuildRequires: graphviz
Provides: %{name}-common = %{version}-%{release}
Obsoletes: %{name}-common < 0.85.0
%description
Wayland is a protocol for a compositor to talk to its clients as well as a C
library implementation of that protocol. The compositor can be a standalone
@ -41,6 +38,14 @@ License: MIT
%description devel
Common headers for wayland
%package doc
Summary: Wayland development documentation
License: MIT
BuildArch: noarch
Obsoletes: wayland < 1.8.91
%description doc
Wayland development documentation
%package -n libwayland-client
Summary: Wayland client library
License: MIT
@ -118,10 +123,6 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \
%postun -n libwayland-server -p /sbin/ldconfig
%files
%doc README TODO
#doc %{_datadir}/doc/wayland/*
%files devel
%{_bindir}/wayland-scanner
%{_includedir}/wayland-util.h
@ -136,6 +137,10 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \
%{_datadir}/wayland/wayland.dtd
%{_mandir}/man3/*.3*
%files doc
%doc README TODO
%{_datadir}/doc/wayland/
%files -n libwayland-client
%{_libdir}/libwayland-client.so.0*
@ -161,6 +166,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \
%{_libdir}/pkgconfig/wayland-server.pc
%changelog
* Fri Aug 21 2015 Kalev Lember <klember@redhat.com> - 1.8.91-2
- Split out wayland-doc subpackage for documentation
* Fri Aug 21 2015 Kalev Lember <klember@redhat.com> - 1.8.91-1
- Update to 1.8.91