Hello community,
here is the log from the commit of package kitty for openSUSE:Factory checked
in at 2020-06-29 21:18:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kitty (Old)
and /work/SRC/openSUSE:Factory/.kitty.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitty"
Mon Jun 29 21:18:32 2020 rev:14 rq:817738 version:0.18.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/kitty/kitty.changes 2020-06-24
15:50:29.792803646 +0200
+++ /work/SRC/openSUSE:Factory/.kitty.new.3060/kitty.changes 2020-06-29
21:19:01.481906409 +0200
@@ -1,0 +2,6 @@
+Fri Jun 26 21:43:23 UTC 2020 - Philipp Seiler <p.sei...@linuxmail.org>
+
+- ported no-docs patch to 0.18.1
+- improved the sed line and added another one for python2
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kitty.spec ++++++
--- /var/tmp/diff_new_pack.Ej9z3R/_old 2020-06-29 21:19:02.041908142 +0200
+++ /var/tmp/diff_new_pack.Ej9z3R/_new 2020-06-29 21:19:02.045908154 +0200
@@ -49,7 +49,7 @@
BuildRequires: wayland-protocols-devel
BuildRequires: zlib-devel
BuildRequires: pkgconfig(dbus-1)
-%if 0%{?sle_version} > 150000 || 0%{?suse_version} >= 1550
+%if 0%{?sle_version} > 150100 || 0%{?suse_version} >= 1550
BuildRequires: python3-Sphinx >= 1.7
%endif
@@ -61,11 +61,12 @@
%prep
%setup -q
-%if 0%{?sle_version} <= 150000 && ! (0%{?suse_version} >= 1550)
+%if 0%{?sle_version} <= 150100 && ! (0%{?suse_version} >= 1550)
%patch0 -p1
%endif
-find . -type f -exec sed -i "s/#!\/usr\/bin\/env
python3/#!\/usr\/bin\/python3/" {} +
+find . -type f -exec sed -i 's@#!/usr/bin/env python3$@#!/usr/bin/python3@' {}
+
+find . -type f -exec sed -i 's@#!/usr/bin/env python$@#!/usr/bin/python@' {} +
%build
#tic -x -o/tmp/tmpWhatever terminfo/kitty.terminfo
@@ -87,7 +88,7 @@
%dir %{_datadir}/icons/hicolor/256x256/
%{_datadir}/icons/hicolor/256x256/apps/
%{_datadir}/terminfo/x/xterm-kitty
-%if 0%{?sle_version} > 150000 || 0%{?suse_version} >= 1550
+%if 0%{?sle_version} > 150100 || 0%{?suse_version} >= 1550
%{_mandir}/man1/kitty.1%{?ext_man}
%{_datadir}/doc/kitty
%endif
++++++ kitty-no-docs.patch ++++++
--- /var/tmp/diff_new_pack.Ej9z3R/_old 2020-06-29 21:19:02.069908229 +0200
+++ /var/tmp/diff_new_pack.Ej9z3R/_new 2020-06-29 21:19:02.069908229 +0200
@@ -1,24 +1,19 @@
-There is no python-sphinx >= 1.7 for Leap 15.0.
-After many requests to provide a package for Leap, I decided to ship a version
-without docs.
-diff -urEbwB kitty-0.14.1/setup.py kitty-0.14.1.new/setup.py
---- kitty-0.14.1/setup.py 2019-05-29 16:27:00.000000000 +0200
-+++ kitty-0.14.1.new/setup.py 2019-05-30 09:22:49.768323634 +0200
-@@ -674,8 +674,6 @@
- safe_makedirs(launcher_dir)
- build_launcher(args, launcher_dir, for_bundle, sh_launcher,
args.for_freeze)
- if not is_macos: # {{{ linux desktop gunk
-- 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)
-@@ -888,8 +886,6 @@
- )
- elif args.action == 'linux-package':
- build(args, native_optimizations=False)
-- if not os.path.exists(os.path.join(base, 'docs/_build/html')):
-- run_tool(['make', 'docs'])
- package(args)
- elif args.action in ('macos-bundle', 'osx-bundle'):
- build(args, native_optimizations=False)
+Fri Jun 26 23:10:44 CEST 2020 - Philipp Seiler <p.sei...@linuxmail.org>
+
+remade patch to work for version 0.18.0
+it just removes the parts in the install script which install
+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
+--- kitty-0.18.1.bak/setup.py 2020-06-26 23:07:11.579036916 +0200
++++ 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
+
+
+ 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)
+ icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', '256x256', 'apps')
+ safe_makedirs(icdir)
+ shutil.copy2('logo/kitty.png', icdir)
