Rebase to version 389

Resolves: rhbz#2256390
This commit is contained in:
Tomas Korbar 2024-01-03 10:33:15 +01:00
parent 0d7792d8a5
commit cdc042c16b
3 changed files with 10 additions and 6 deletions

2
.gitignore vendored
View File

@ -41,3 +41,5 @@
/xterm-385.tgz.asc /xterm-385.tgz.asc
/xterm-388.tgz /xterm-388.tgz
/xterm-388.tgz.asc /xterm-388.tgz.asc
/xterm-389.tgz
/xterm-389.tgz.asc

View File

@ -1,3 +1,3 @@
SHA512 (xterm-388.tgz) = 7ded1c32b18e629222c9109dc9eb206511762447f07a1043fb63802f036d6d685d332697edd46556c07e6fb5ca95f9bcf836c48d05bd72d626bb90dfa1bfc21a SHA512 (xterm-389.tgz) = a87703692d621f38670c85be3495aa3840de5e53136dc7be01b3b7003add6109310cc583ac5f0ac1f67e588628336a4b48e947f8d1a326d33a804e2c164890fc
SHA512 (xterm-388.tgz.asc) = 60d45780deba965b11bfe63a173d7413a76c05f043666aa41973296745976fd51380bebb6b6a120983c206889d550fb35895233492c674bc04555957829e4563 SHA512 (xterm-389.tgz.asc) = a793f911ed2aea78cd7ab289af7f031054ea86a6d726f4cd4775c44b30e9cc6217adbcda49bd195aa04a5c22ccf9d1cdefd99fe3d0785c5e126a901b0399195e
SHA512 (dickey@invisible-island.net-rsa3072.asc) = 19e19d3844b82d956ed01fc553bfbfcbd80f41a0ed2d51a2d0a6b9d2d5eede9482c9dba792f540c5cc386b8bf5d4a4a8da831edc42a2e50465fa42a3224b55af SHA512 (dickey@invisible-island.net-rsa3072.asc) = 19e19d3844b82d956ed01fc553bfbfcbd80f41a0ed2d51a2d0a6b9d2d5eede9482c9dba792f540c5cc386b8bf5d4a4a8da831edc42a2e50465fa42a3224b55af

View File

@ -3,8 +3,8 @@
Summary: Terminal emulator for the X Window System Summary: Terminal emulator for the X Window System
Name: xterm Name: xterm
Version: 388 Version: 389
Release: 3%{?dist} Release: 1%{?dist}
URL: https://invisible-island.net/xterm URL: https://invisible-island.net/xterm
License: MIT AND X11 AND HPND AND CC-BY-4.0 License: MIT AND X11 AND HPND AND CC-BY-4.0
BuildRequires: make BuildRequires: make
@ -22,7 +22,6 @@ Source3: https://invisible-island.net/archives/xterm/16colors.txt
Patch1: xterm-defaults.patch Patch1: xterm-defaults.patch
Patch2: xterm-desktop.patch Patch2: xterm-desktop.patch
Patch3: xterm-man-paths.patch Patch3: xterm-man-paths.patch
Patch4: xterm-configure-c99.patch
%global x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt) %global x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt)
@ -45,7 +44,6 @@ indicate the current size of the window from which the command is run.
%patch 1 -p1 -b .defaults %patch 1 -p1 -b .defaults
%patch 2 -p1 -b .desk %patch 2 -p1 -b .desk
%patch 3 -p1 -b .man-paths %patch 3 -p1 -b .man-paths
%patch 4 -p1 -b .c99
for f in THANKS; do for f in THANKS; do
iconv -f iso8859-1 -t utf8 -o ${f}{_,} && iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@ -107,6 +105,10 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
%{_mandir}/man1/resize.1* %{_mandir}/man1/resize.1*
%changelog %changelog
* Wed Jan 03 2024 Tomas Korbar <tkorbar@redhat.com> - 389-1
- Rebase to version 389
- Resolves: rhbz#2256390
* Tue Nov 28 2023 Florian Weimer <fweimer@redhat.com> - 388-3 * Tue Nov 28 2023 Florian Weimer <fweimer@redhat.com> - 388-3
- Fix C compatibility issue in the configure script (#2251945) - Fix C compatibility issue in the configure script (#2251945)