diff --git a/.gitignore b/.gitignore index 9b02e2b..ea9a766 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /kitty-0.20.0.tar.gz /kitty-0.20.1.tar.gz /kitty-0.20.2.tar.gz +/kitty-0.20.3.tar.gz diff --git a/93d4eca2d447bd6bd082f11a35848b2553d8aec2.patch b/93d4eca2d447bd6bd082f11a35848b2553d8aec2.patch deleted file mode 100644 index bb47325..0000000 --- a/93d4eca2d447bd6bd082f11a35848b2553d8aec2.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 93d4eca2d447bd6bd082f11a35848b2553d8aec2 Mon Sep 17 00:00:00 2001 -From: Kovid Goyal -Date: Wed, 28 Apr 2021 13:11:01 +0530 -Subject: [PATCH] Fix kitty.conf man page being installed in incorrect location - -Fixes #3543 ---- - setup.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index c56df6fe7..e77095026 100755 ---- a/setup.py -+++ b/setup.py -@@ -827,6 +827,7 @@ def copy_man_pages(ddir: str) -> None: - safe_makedirs(mandir) - with suppress(FileNotFoundError): - shutil.rmtree(os.path.join(mandir, 'man1')) -+ shutil.rmtree(os.path.join(mandir, 'man5')) - src = 'docs/_build/man' - if not os.path.exists(src): - raise SystemExit('''\ -@@ -834,7 +835,10 @@ def copy_man_pages(ddir: str) -> None: - make && make docs - (needs the sphinx documentation system to be installed) - ''') -- shutil.copytree(src, os.path.join(mandir, 'man1')) -+ for x in '15': -+ os.makedirs(os.path.join(mandir, f'man{x}')) -+ for y in glob.glob(os.path.join(src, f'*.{x}')): -+ shutil.copy2(y, os.path.join(mandir, f'man{x}')) - - - def copy_html_docs(ddir: str) -> None: diff --git a/kitty-0.18.3-no_sphinx.diff b/kitty-0.18.3-no_sphinx.diff deleted file mode 100644 index fb25bb1..0000000 --- a/kitty-0.18.3-no_sphinx.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- kitty-0.18.3/setup.py.no_sphinx 2020-08-11 01:49:32.000000000 -0700 -+++ kitty-0.18.3/setup.py 2020-08-24 17:42:39.080608804 -0700 -@@ -823,10 +823,11 @@ - - - def create_linux_bundle_gunk(ddir: str, libdir_name: str) -> None: -- if not os.path.exists('docs/_build/html'): -- run_tool(['make', 'docs']) -- copy_man_pages(ddir) -- copy_html_docs(ddir) -+ if os.path.exists('/usr/bin/sphinx-build'): -+ if not os.path.exists('docs/_build/html'): -+ run_tool(['make', 'docs']) -+ copy_man_pages(ddir) -+ copy_html_docs(ddir) - icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', '256x256', 'apps') - safe_makedirs(icdir) - shutil.copy2('logo/kitty.png', icdir) diff --git a/kitty-no_sphinx.patch b/kitty-no_sphinx.patch new file mode 100644 index 0000000..388c99d --- /dev/null +++ b/kitty-no_sphinx.patch @@ -0,0 +1,16 @@ +--- a/setup.py 2021-05-06 05:41:41.000000000 +0300 ++++ b/setup.py 2021-05-06 06:26:41.095551377 +0300 +@@ -901,9 +901,10 @@ + + + def create_linux_bundle_gunk(ddir: str, libdir_name: str) -> None: +- if not os.path.exists('docs/_build/html'): +- make = "gmake" if is_freebsd else "make" +- run_tool([make, 'docs']) ++ if os.path.exists('/usr/bin/sphinx-build'): ++ if not os.path.exists('docs/_build/html'): ++ 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') diff --git a/kitty.spec b/kitty.spec index e6df2f7..f7871ef 100644 --- a/kitty.spec +++ b/kitty.spec @@ -7,7 +7,7 @@ %endif Name: kitty -Version: 0.20.2 +Version: 0.20.3 Release: 1%{?dist} Summary: Cross-platform, fast, feature full, GPU based terminal emulator @@ -17,13 +17,9 @@ License: GPLv3 and zlib and BSD URL: https://sw.kovidgoyal.net/kitty Source0: https://github.com/kovidgoyal/kitty/archive/v%{version}/%{name}-%{version}.tar.gz -# allow skipping documentation build -# (EPEL8's Sphinx is too old and does not have sphinx-build) -Patch0: kitty-0.18.3-no_sphinx.diff - -# Fix kitty.conf man page being installed in incorrect location -# https://github.com/kovidgoyal/kitty/issues/3543 -Patch1: https://github.com/kovidgoyal/kitty/commit/93d4eca2d447bd6bd082f11a35848b2553d8aec2.patch +# Allow skipping documentation build. +# EPEL8's Sphinx is too old and does not have sphinx-build. +Patch0: kitty-no_sphinx.patch # Add AppData manifest file # * https://github.com/kovidgoyal/kitty/pull/2088 @@ -197,6 +193,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop %changelog +* Thu May 06 2021 Artem Polishchuk - 0.20.3-1 +- build(update): 0.20.3 + * Wed Apr 28 2021 Artem Polishchuk - 0.20.2-1 - build(update): 0.20.2 diff --git a/sources b/sources index 841fa4d..936cb7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kitty-0.20.2.tar.gz) = 3cee1501c2787283654e0c48a6dd40a969d570003722dc0558d278b29a22df51d4e215d66cd74a417a08bff9beaf8cf69f594f34dab23647d9abdba831c9fb65 +SHA512 (kitty-0.20.3.tar.gz) = 98f8aab36ffb957df5136e6d86a172dede1d1e1b75c8f21d58bc6a527c1f46bc39f18c134e1432f068db619266c67fb3cb79fe06389df04d47d0cd48e4453ee5