The package rpms/kitty.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/kitty.git/commit/?id=2fae0d8c45e6....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 2fae0d8c45e684d02355d088e89fcf78d72ea9ae
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri Aug 28 03:41:24 2020 -0400
Enable building on s390x.
diff --git a/kitty.spec b/kitty.spec
index fd33c9d..fa9a66b 100644
--- a/kitty.spec
+++ b/kitty.spec
@@ -6,13 +6,9 @@
Name: kitty
Version: 0.18.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Cross-platform, fast, feature full, GPU based terminal emulator
-# Tests not passed on s390x arch
-# *
https://github.com/kovidgoyal/kitty/issues/2473
-ExcludeArch: s390x
-
# BSD: docs/_templates/searchbox.html
# zlib: glfw/
License: GPLv3 and zlib and BSD
@@ -189,6 +185,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
%changelog
+* Fri Aug 28 2020 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 0.18.3-3
+- Enable building on s390x
+
* Mon Aug 24 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 0.18.3-2
- Support building on EPEL8
commit 4841115190835e2e343751c1cbeb2ecd802dd00e
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Mon Aug 24 17:51:17 2020 -0700
Support building on EPEL8
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/kitty-0.18.3-no_sphinx.diff b/kitty-0.18.3-no_sphinx.diff
new file mode 100644
index 0000000..fb25bb1
--- /dev/null
+++ b/kitty-0.18.3-no_sphinx.diff
@@ -0,0 +1,18 @@
+--- 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.spec b/kitty.spec
index 6538322..fd33c9d 100644
--- a/kitty.spec
+++ b/kitty.spec
@@ -1,6 +1,12 @@
+%if 0%{?fedora}
+%bcond_without doc
+%else
+%bcond_with doc
+%endif
+
Name: kitty
Version: 0.18.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Cross-platform, fast, feature full, GPU based terminal emulator
# Tests not passed on s390x arch
@@ -12,6 +18,9 @@ ExcludeArch: s390x
License: GPLv3 and zlib and BSD
URL:
https://sw.kovidgoyal.net/kitty
Source0:
https://github.com/kovidgoyal/kitty/archive/v%{version}/%{name}-%{version...
+# allow skipping documentation build
+# (EPEL8's Sphinx is too old and does not have sphinx-build)
+Patch0: kitty-0.18.3-no_sphinx.diff
# Add AppData manifest file
# *
https://github.com/kovidgoyal/kitty/pull/2088
@@ -98,6 +107,7 @@ The terminfo file for Kitty Terminal.
# doc package
+%if %{with doc}
%package doc
Summary: Documentation for %{name}
@@ -105,6 +115,7 @@ BuildRequires: python3dist(sphinx)
%description doc
This package contains the documentation for %{name}.
+%endif
%prep
@@ -138,9 +149,11 @@ install -m0644 -Dp %{SOURCE1}
%{buildroot}%{_metainfodir}/%{name}.appdata.xml
# script-without-shebang '__init__.py'
find %{buildroot} -type f -name "*.py*" -exec chmod -x "{}" \;
+%if %{with doc}
# rpmlint fixes
rm %{buildroot}%{_datadir}/doc/%{name}/html/.buildinfo \
%{buildroot}%{_datadir}/doc/%{name}/html/.nojekyll
+%endif
%check
@@ -157,21 +170,28 @@ desktop-file-validate
%{buildroot}/%{_datadir}/applications/*.desktop
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/*/*.png
%{_libdir}/%{name}/
+%if %{with doc}
%{_mandir}/man1/*
+%endif
%{_metainfodir}/*.xml
%files terminfo
%license LICENSE
%{_datadir}/terminfo/x/xterm-%{name}
+%if %{with doc}
%files doc
%license LICENSE
%doc CONTRIBUTING.md CHANGELOG.rst INSTALL.md
%{_datadir}/doc/%{name}/html
%dir %{_datadir}/doc/%{name}
+%endif
%changelog
+* Mon Aug 24 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 0.18.3-2
+- Support building on EPEL8
+
* Tue Aug 11 2020 Artem Polishchuk <ego.cordatus(a)gmail.com> - 0.18.3-1
- Update to 0.18.3