From f450608b069a87e6d23b93a8c830e3f21dadb26263d04535bd0cce3a46600e4a Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 16 Apr 2021 12:05:52 +0000 Subject: [PATCH] - Fix build on Factory: kitty does not properly separate build and install. We used to do both in the %build section. Since rpm 4.16 cleans the buildroot is cleaned before %install. So now we run build/install in the %install section OBS-URL: https://build.opensuse.org/package/show/X11:terminals/kitty?expand=0&rev=70 --- kitty.changes | 9 +++++++++ kitty.spec | 6 ++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/kitty.changes b/kitty.changes index f26dad5..ac43ba3 100644 --- a/kitty.changes +++ b/kitty.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Apr 16 12:04:31 UTC 2021 - Michael Vetter + +- Fix build on Factory: + kitty does not properly separate build and install. We used to + do both in the %build section. Since rpm 4.16 cleans the buildroot + is cleaned before %install. So now we run build/install in the + %install section + ------------------------------------------------------------------- Mon Dec 28 12:21:25 UTC 2020 - Michael Vetter diff --git a/kitty.spec b/kitty.spec index 045a3ec..a0a4d6f 100644 --- a/kitty.spec +++ b/kitty.spec @@ -69,13 +69,11 @@ bracketed paste and so on, and which can be controlled by scripts. find . -type f -exec sed -i 's@#!%{_bindir}/env python3$@#!%{_bindir}/python3@' {} + find . -type f -exec sed -i 's@#!%{_bindir}/env python$@#!%{_bindir}/python@' {} + -%build -#tic -x -o/tmp/tmpWhatever terminfo/kitty.terminfo -python3 setup.py --verbose linux-package --prefix %{buildroot}%{_prefix} - %install # yes they have a makefile, no they dont use it properly # no they dont have a make install +# we used to have this in the build section but since rpm 4.16 buildroot is cleaned +python3 setup.py --verbose linux-package --prefix %{buildroot}%{_prefix} %fdupes %{buildroot}%{_prefix}/lib