Accepting request 936517 from home:fbui:branches:X11:Wayland

- Fix the condition expressions that are used to build the
  doc. Currently we want the doc on TW only and disabled on Leap since
  sphinx has not been update yet (including in Leap 15.4).
- Fix build on TW
  * Dependency on python3-sphinx-inline-tabs was missing. It was
    needed to build the doc
- Fix build on Leap
  * python3-importlib-resources is named python3-importlib_resources
    on Leap :-/
- Rebased kitty-no-docs.patch

OBS-URL: https://build.opensuse.org/request/show/936517
OBS-URL: https://build.opensuse.org/package/show/X11:terminals/kitty?expand=0&rev=91

kitty-no-docs.patch

@@ -1,19 +1,30 @@
-Fri Jun 26 23:10:44 CEST 2020 - Philipp Seiler <p.seiler@linuxmail.org>
+From 555b8f4232d7b1f35b83966d7a879f26f806059b Mon Sep 17 00:00:00 2001
+From: Franck Bui <fbui@suse.com>
+Date: Wed, 8 Dec 2021 14:26:36 +0100
+Subject: [PATCH 1/1] Disable build of documentation
 
-remade patch to work for version 0.18.0
+Leap doesn't ship a recent enough version of sphinx for building kitty
-it just removes the parts in the install script which install
+documentation.
-the documentation. But there is no python-sphinx >= 1.7 for Leap 15.0.
+---
-diff -dupr kitty-0.18.1.bak/setup.py kitty-0.18.1/setup.py
+ setup.py | 5 -----
---- kitty-0.18.1.bak/setup.py	2020-06-26 23:07:11.579036916 +0200
+ 1 file changed, 5 deletions(-)
-+++ kitty-0.18.1/setup.py	2020-06-26 23:10:16.868682608 +0200
+
-@@ -819,10 +819,6 @@ def compile_python(base_path: str) -> No
+diff --git a/setup.py b/setup.py
+index 98873dc6..00965423 100755
+--- a/setup.py
++++ b/setup.py
+@@ -944,11 +944,6 @@ def c(base_path: str, **kw: object) -> None:
  
  
  def create_linux_bundle_gunk(ddir: str, libdir_name: str) -> None:
 -    if not os.path.exists('docs/_build/html'):
--        run_tool(['make', 'docs'])
+-        make = "gmake" if is_freebsd else "make"
+-        run_tool([make, 'docs'])
 -    copy_man_pages(ddir)
 -    copy_html_docs(ddir)
-     icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', '256x256', 'apps')
+     for (icdir, ext) in {'256x256': 'png', 'scalable': 'svg'}.items():
+         icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', icdir, 'apps')
          safe_makedirs(icdir)
-     shutil.copy2('logo/kitty.png', icdir)
+-- 
+2.31.1
+

kitty.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Dec  8 13:46:09 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Fix the condition expressions that are used to build the
+  doc. Currently we want the doc on TW only and disabled on Leap since
+  sphinx has not been update yet (including in Leap 15.4).
+
+- Fix build on TW
+  * Dependency on python3-sphinx-inline-tabs was missing. It was
+    needed to build the doc
+
+- Fix build on Leap
+  * python3-importlib-resources is named python3-importlib_resources
+    on Leap :-/
+
+- Rebased kitty-no-docs.patch
+
 -------------------------------------------------------------------
 Tue Aug 17 07:12:47 UTC 2021 - Michael Vetter <mvetter@suse.com>
 

kitty.spec

@@ -41,8 +41,13 @@ BuildRequires:  libpng16-compat-devel
 BuildRequires:  libwayland-egl-devel
 BuildRequires:  libxkbcommon-devel
 BuildRequires:  libxkbcommon-x11-devel
+%if 0%{?suse_version} >= 1550
 BuildRequires:  python3-importlib-resources
+BuildRequires:  python3-sphinx-inline-tabs
 BuildRequires:  python3-sphinxcontrib-copybutton
+%else # Leap
+BuildRequires:  python3-importlib_resources
+%endif
 # for 'tic'
 BuildRequires:  ncurses-devel
 BuildRequires:  pkgconfig
@@ -64,7 +69,7 @@ bracketed paste and so on, and which can be controlled by scripts.
 
 %prep
 %setup -q
-%if 0%{?sle_version} <= 150100 && ! (0%{?suse_version} >= 1550)
+%if 0%{?suse_version} < 1550
 %patch0 -p1
 %endif
 
@@ -85,11 +90,9 @@ python3 setup.py --verbose linux-package --prefix %{buildroot}%{_prefix}
 %{_bindir}/%{name}
 %{_prefix}/lib/%{name}
 %{_datadir}/applications/%{name}.desktop
-%dir %{_datadir}/icons/hicolor/
+%{_datadir}/icons/hicolor/
-%dir %{_datadir}/icons/hicolor/256x256/
-%{_datadir}/icons/hicolor/256x256/apps/
 %{_datadir}/terminfo/x/xterm-%{name}
-%if 0%{?sle_version} > 150100 || 0%{?suse_version} >= 1550
+%if 0%{?suse_version} >= 1550
 %{_mandir}/man1/%{name}.1%{?ext_man}
 %{_datadir}/doc/%{name}
 %{_mandir}/man5/kitty.conf.5%{?ext_man}