#1 add bcond for luit (dropping support by default)
Merged a year ago by tkorbar. Opened a year ago by jorton.
rpms/ jorton/xterm luit-bcond  into  rawhide

file modified
+10 -7
@@ -1,14 +1,17 @@ 

+ 

+ %bcond_with trace

+ 

  Summary: Terminal emulator for the X Window System

  Name: xterm

  Version: 367

- Release: 2%{?dist}

+ Release: 3%{?dist}

  URL: https://invisible-island.net/xterm

  License: MIT

  BuildRequires: make

  BuildRequires: gcc pkgconfig ncurses-devel libutempter-devel

  BuildRequires: libXft-devel libXaw-devel libXext-devel desktop-file-utils

- BuildRequires: libxkbfile-devel luit pcre2-devel pkgconfig(libpcre2-posix)

- Requires: luit xterm-resize = %{version}-%{release}

+ BuildRequires: libxkbfile-devel pcre2-devel pkgconfig(libpcre2-posix)

+ Requires: xterm-resize = %{version}-%{release}

  Recommends: xorg-x11-fonts-misc

  

  Source0: ftp://ftp.invisible-island.net/xterm/%{name}-%{version}.tgz
@@ -18,8 +21,6 @@ 

  Patch2: xterm-desktop.patch

  Patch3: xterm-man-paths.patch

  

- %bcond_with trace

- 

  %global x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt)

  

  %description
@@ -52,7 +53,6 @@ 

  	--disable-backarrow-key \

  	--enable-256-color \

  	--enable-exec-xterm \

- 	--enable-luit \

  %{?with_trace: --enable-trace} \

  	--enable-warnings \

  	--enable-wide-chars \
@@ -63,7 +63,7 @@ 

  	--with-tty-group=tty \

  	--disable-full-tgetent \

  	--enable-sixel-graphics \

-   --with-pcre2

+         --with-pcre2

  

  %make_build

  
@@ -103,6 +103,9 @@ 

  %{_mandir}/man1/resize.1*

  

  %changelog

+ * Fri May 21 2021 Joe Orton <jorton@redhat.com> - 367-3

+ - drop luit support

+ 

  * Mon May 17 2021 Peter Hutterer <peter.hutterer@redhat.com> 367-2

  - Add luit to Requires

  - Resolves: rhbz#1959210

no initial comment

IMO the bcond is unnecessary here. either we'll never build it with luit ever again, or we'll have to re-instate in which case the git history will tell us how to bring it back. As soon as this is merged I'll orphan luit, so the bcond will stop working once luit is removed from the Fedoras anyway.

rebased onto 78a7d5f

a year ago

OK thanks for the review @whot - rebased to drop the luit support entirely.

Pull-Request has been merged by tkorbar

a year ago
Metadata