Conditionalize book documentation

Documentation which requires unwanted dependencies is generally disabled.

https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/548

.gitignore

@@ -60,3 +60,15 @@
 /wayland-1.20.0.tar.xz
 /wayland-1.21.0.tar.xz
 /wayland-1.21.0.tar.xz.sig
+/wayland-1.22.0.tar.xz
+/wayland-1.22.0.tar.xz.sig
+/wayland-1.23.0.tar.xz
+/wayland-1.23.0.tar.xz.sig
+/wayland-1.23.1.tar.xz
+/wayland-1.23.1.tar.xz.sig
+/wayland-1.24.0.tar.xz
+/wayland-1.24.0.tar.xz.sig
+/wayland-1.25.0.tar.xz
+/wayland-1.25.0.tar.xz.sig
+/wayland-1.26.0.tar.xz
+/wayland-1.26.0.tar.xz.sig

0001-doc-add-option-to-not-build-the-book.patch

@@ -0,0 +1,53 @@
+From f1798e0601aff530f1f9025067ff46d2867a1009 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Thu, 9 Jul 2026 17:02:36 -0400
+Subject: [PATCH] doc: add option to not build the book
+
+mdbook is not available in all distributions, and other documentation does
+not require it.
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ doc/meson.build   | 6 ++++--
+ meson_options.txt | 4 ++++
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index b9f6fcb..7b3d7d8 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -6,7 +6,7 @@ dot = find_program('dot')
+ doxygen = find_program('doxygen')
+ xsltproc = find_program('xsltproc')
+ xmlto = find_program('xmlto')
+-mdbook = find_program('mdbook')
++mdbook = find_program('mdbook', required: get_option('book'))
+ 
+ cmd = run_command(doxygen, '--version', check: true)
+ message('doxygen: ' + cmd.stdout().strip())
+@@ -40,4 +40,6 @@ publican_html_dir = 'html'
+ 
+ subdir('doxygen')
+ subdir('publican')
+-subdir('book')
++if mdbook.found()
++	subdir('book')
++endif
+diff --git a/meson_options.txt b/meson_options.txt
+index 02c2346..3445f3f 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -22,6 +22,10 @@ option('dtd_validation',
+   description: 'Validate the protocol DTD (requires libxml2)',
+   type: 'boolean',
+   value: true)
++option('book',
++  description: 'Build the Wayland Book (requires mdbook)',
++  type: 'boolean',
++  value: true)
+ option('icon_directory',
+   description: 'Location used to look for cursors (defaults to ${datadir}/icons if unset)',
+   type: 'string',
+-- 
+2.55.0
+

sources

@@ -1,2 +1,2 @@
-SHA512 (wayland-1.21.0.tar.xz) = 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
-SHA512 (wayland-1.21.0.tar.xz.sig) = 489351948ad10d54049a76c12763532aa0e16bd56bb246d9810011a902a3c701b0de3cf0dae58d8c06882b457728e7321016e9ee527202b2ef2d5fd1f032b818
+SHA512 (wayland-1.26.0.tar.xz) = 50861b0c40cedec5f31b49ff1e99fc135a299fa4a8e2ff50ff4bac3f42e2f3f7be38271929fd2f6e58d83d5df516f643946ceba7937cc199581487c082c7ec31
+SHA512 (wayland-1.26.0.tar.xz.sig) = 051de7c3c80c8cef9cf713d7346467a2ce10c10ed7a39f49f3567d0ed08f409179c56e10ce8657e9eed8c544eafb2e254e251d147b13e472e60becf46100d56a

wayland.spec

@@ -1,14 +1,20 @@
+%bcond book %{undefined rhel}
+
 Name:           wayland
-Version:        1.21.0
-Release:        1%{?dist}
+Version:        1.26.0
+Release:        2%{?dist}
 Summary:        Wayland Compositor Infrastructure
 
+# SPDX
 License:        MIT
 URL:            http://wayland.freedesktop.org/
 Source0:        https://gitlab.freedesktop.org/%{name}/%{name}/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz
 Source1:        https://gitlab.freedesktop.org/%{name}/%{name}/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz.sig
 Source2:        emersion-gpg-key.asc
 
+# https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/548
+Patch0:         0001-doc-add-option-to-not-build-the-book.patch
+
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  docbook-style-xsl
@@ -17,6 +23,9 @@ BuildRequires:  expat-devel
 BuildRequires:  graphviz
 BuildRequires:  libxml2-devel
 BuildRequires:  libxslt
+%if %{with book}
+BuildRequires:  mdbook
+%endif
 BuildRequires:  meson
 BuildRequires:  pkgconfig(libffi)
 BuildRequires:  xmlto
@@ -31,57 +40,20 @@ display server running on Linux kernel modesetting and evdev input devices,
 an X application, or a wayland client itself. The clients can be traditional
 applications, X servers (rootless or fullscreen) or other display servers.
 
+%dnl ------------------------------------------------------------------------
+
 %package        devel
 Summary:        Development files for %{name}
 Requires:       libwayland-client%{?_isa} = %{version}-%{release}
 Requires:       libwayland-cursor%{?_isa} = %{version}-%{release}
 Requires:       libwayland-egl%{?_isa} = %{version}-%{release}
 Requires:       libwayland-server%{?_isa} = %{version}-%{release}
+Requires:       pkgconfig(libffi)
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-%package doc
-Summary: Wayland development documentation
-BuildArch: noarch
-%description doc
-Wayland development documentation
-
-%package -n libwayland-client
-Summary: Wayland client library
-%description -n libwayland-client
-Wayland client library
-
-%package -n libwayland-cursor
-Summary: Wayland cursor library
-%description -n libwayland-cursor
-Wayland cursor library
-
-%package -n libwayland-egl
-Summary: Wayland egl library
-%description -n libwayland-egl
-Wayland egl library
-
-%package -n libwayland-server
-Summary: Wayland server library
-%description -n libwayland-server
-Wayland server library
-
-%prep
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%autosetup -p1
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%check
-%meson_test
-
 %files devel
 %{_bindir}/wayland-scanner
 %{_includedir}/wayland-*.h
@@ -94,27 +66,141 @@ Wayland server library
 %{_datadir}/wayland/wayland.dtd
 %{_mandir}/man3/*.3*
 
+%dnl ------------------------------------------------------------------------
+
+%package doc
+Summary: Wayland development documentation
+BuildArch: noarch
+%if %{with book}
+# Required for mdbook generated docs
+Requires: adobe-source-code-pro-fonts
+Requires: open-sans-fonts
+%endif
+
+%description doc
+Wayland development documentation
+
 %files doc
-%doc README
+%doc README.md
 %{_datadir}/doc/wayland/
 
+%dnl ------------------------------------------------------------------------
+
+%package -n libwayland-client
+Summary: Wayland client library
+
+%description -n libwayland-client
+Wayland client library
+
 %files -n libwayland-client
 %license COPYING
 %{_libdir}/libwayland-client.so.0*
 
+%dnl ------------------------------------------------------------------------
+
+%package -n libwayland-cursor
+Summary: Wayland cursor library
+Requires: libwayland-client%{?_isa} = %{version}-%{release}
+
+%description -n libwayland-cursor
+Wayland cursor library
+
 %files -n libwayland-cursor
 %license COPYING
 %{_libdir}/libwayland-cursor.so.0*
 
+%dnl ------------------------------------------------------------------------
+
+%package -n libwayland-egl
+Summary: Wayland egl library
+
+%description -n libwayland-egl
+Wayland egl library
+
 %files -n libwayland-egl
 %license COPYING
 %{_libdir}/libwayland-egl.so.1*
 
+%dnl ------------------------------------------------------------------------
+
+%package -n libwayland-server
+Summary: Wayland server library
+
+%description -n libwayland-server
+Wayland server library
+
 %files -n libwayland-server
 %license COPYING
 %{_libdir}/libwayland-server.so.0*
 
+%dnl ------------------------------------------------------------------------
+
+%prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%autosetup -p1
+
+%conf
+%meson %{!?with_book:-Dbook=false}
+
+%build
+%meson_build
+
+%install
+%meson_install
+
+%check
+%meson_test
+
 %changelog
+* Fri Jul 17 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1.26.0-2
+- Conditionalize book documentation
+
+* Thu Jul 16 2026 Neal Gompa <ngompa@fedoraproject.org> - 1.26.0-1
+- Update to 1.26.0
+
+* Sun Jun 07 2026 Neal Gompa <ngompa@fedoraproject.org> - 1.25.0-1
+- Update to 1.25.0
+- Modernize spec
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Mon Oct 13 2025 Olivier Fourdan <ofourdan@redhat.com> - 1.24.0-2
+- Add dependency on libffi for the devel package (#2403323)
+
+* Tue Aug 05 2025 Neal Gompa <ngompa@fedoraproject.org> - 1.24.0-1
+- Update to 1.24.0
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.23.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Mon Apr 14 2025 Olivier Fourdan <ofourdan@redhat.com> - 1.23.1-1
+- Update to 1.23.1
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.23.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.23.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jun 28 2024 Olivier Fourdan <ofourdan@redhat.com> - 1.23.0-1
+- Update to 1.23.0
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Sep 07 2023 José Expósito <jexposit@redhat.com>
+- SPDX migration: license is already SPDX compatible
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Apr 04 2023 Kalev Lember <klember@redhat.com> - 1.22.0-1
+- Update to 1.22.0
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.21.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Tue Jul 26 2022 Mike Rochefort <mroche@redhat.com> - 1.21.0-1
 - Update to 1.21.0