From ffd6bfcf25b0ccbd0fe91a25cf549e274dc1e61c Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Tue, 14 Dec 2021 12:31:02 +0100 Subject: [PATCH] drop terminfo subpackage; rel 2 instead require terminfo package new enough to already provide foot entry --- foot.spec | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/foot.spec b/foot.spec index df72d88..38e64aa 100644 --- a/foot.spec +++ b/foot.spec @@ -1,7 +1,7 @@ Summary: A fast, lightweight and minimalistic Wayland terminal emulator Name: foot Version: 1.10.3 -Release: 1 +Release: 2 License: MIT Group: Applications/Terminal Source0: https://codeberg.org/dnkl/foot/archive/%{version}.tar.gz @@ -27,21 +27,14 @@ Requires(post,postun): gtk-update-icon-cache Requires: fcft < 3.0.0 Requires: fcft >= 2.4.0 Requires: hicolor-icon-theme -Requires: terminfo-foot = %{version}-%{release} +Requires: terminfo >= 6.2.20210731 Requires: xorg-lib-libxkbcommon >= 1.0.0 +Obsoletes: terminfo-foot < 1.10.3-2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description A fast, lightweight and minimalistic Wayland terminal emulator. -%package -n terminfo-foot -Summary: terminfo database entries for foot terminal emulator -Requires: terminfo -BuildArch: noarch - -%description -n terminfo-foot -terminfo database entries for foot terminal emulator. - %package -n bash-completion-foot Summary: Bash completion for foot command line Group: Applications/Shells @@ -79,7 +72,9 @@ ZSH completion for foot command line. %setup -q -n %{name} %build -%meson build +%meson build \ + -Dterminfo=disabled + %ninja_build -C build %install @@ -114,11 +109,6 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/foot.ini.5* %{_mandir}/man7/foot-ctlseqs.7* -%files -n terminfo-foot -%defattr(644,root,root,755) -%{_datadir}/terminfo/f/foot -%{_datadir}/terminfo/f/foot-direct - %files -n bash-completion-foot %defattr(644,root,root,755) %{bash_compdir}/foot -- 2.44.0