From 261f00e5a84cccd28f1776c6eb111bbba14e3a9c Mon Sep 17 00:00:00 2001
From: Tomas Korbar <tkorbar@redhat.com>
Date: Tue, 30 May 2023 13:24:06 +0200
Subject: [PATCH] Rebase to version 381

Resolves:rhbz#2210609
---
 .gitignore |  3 +++
 sources    |  4 +++-
 xterm.spec | 22 +++++++++++++++-------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f5276b..a5c9005 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@
 /xterm-378.tgz
 /xterm-379.tgz
 /xterm-380.tgz
+/xterm-381.tgz
+/dickey@invisible-island.net-rsa3072.asc
+/xterm-381.tgz.asc
diff --git a/sources b/sources
index ee4d6b7..e40fdb4 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-SHA512 (xterm-380.tgz) = cd901298af8df5f2eb5ee551d8810ac18a6b6298b29070529675af60b8aeaab05f78aaf9a13c22b88591b1e1ad7190d62dc10b9a59bbbfd884d1a436c9375dd4
+SHA512 (xterm-381.tgz) = 8cfcfc1f5c5404bcee56265765e489db676838fed6c3182fcc078c55952d6ac76835705d2fa414098fb7e373acb6229f0f5b44150a43844990c58d69cdeec591
+SHA512 (dickey@invisible-island.net-rsa3072.asc) = 19e19d3844b82d956ed01fc553bfbfcbd80f41a0ed2d51a2d0a6b9d2d5eede9482c9dba792f540c5cc386b8bf5d4a4a8da831edc42a2e50465fa42a3224b55af
+SHA512 (xterm-381.tgz.asc) = 05217da892f6b6261c33359b1905b97b0164bbbf155be4e516cd624e5afc9dfa8b89a46f1ae302c7ed486ad466c19200becda556c35fa09fd6a932b634cb9b10
diff --git a/xterm.spec b/xterm.spec
index d2efbca..b4e16a8 100644
--- a/xterm.spec
+++ b/xterm.spec
@@ -3,7 +3,7 @@
 
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 380
+Version: 381
 Release: 1%{?dist}
 URL: https://invisible-island.net/xterm
 License: MIT
@@ -11,10 +11,13 @@ BuildRequires: make
 BuildRequires: gcc pkgconfig ncurses-devel libutempter-devel
 BuildRequires: libXft-devel libXaw-devel libXext-devel desktop-file-utils
 BuildRequires: libxkbfile-devel pcre2-devel pkgconfig(libpcre2-posix)
+BuildRequires: gnupg2
 Recommends: xorg-x11-fonts-misc
 
-Source0: ftp://ftp.invisible-island.net/xterm/%{name}-%{version}.tgz
-Source1: ftp://ftp.invisible-island.net/xterm/16colors.txt
+Source0: https://invisible-island.net/archives/xterm/%{name}-%{version}.tgz
+Source1: https://invisible-island.net/archives/xterm/%{name}-%{version}.tgz.asc
+Source2: https://invisible-island.net/public/dickey@invisible-island.net-rsa3072.asc
+Source3: https://invisible-island.net/archives/xterm/16colors.txt
 
 Patch1: xterm-defaults.patch
 Patch2: xterm-desktop.patch
@@ -35,11 +38,12 @@ Prints a shell command for setting the appropriate environment variables to
 indicate the current size of the window from which the command is run.
 
 %prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %setup -q
 
-%patch1 -p1 -b .defaults
-%patch2 -p1 -b .desk
-%patch3 -p1 -b .man-paths
+%patch 1 -p1 -b .defaults
+%patch 2 -p1 -b .desk
+%patch 3 -p1 -b .man-paths
 
 for f in THANKS; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@@ -68,7 +72,7 @@ done
 %install
 %make_install
 
-cp -fp %{SOURCE1} 16colors.txt
+cp -fp %{SOURCE3} 16colors.txt
 
 desktop-file-install \
 %if 0%{?fedora} && 0%{?fedora} < 19
@@ -101,6 +105,10 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
 %{_mandir}/man1/resize.1*
 
 %changelog
+* Mon May 29 2023 Tomas Korbar <tkorbar@redhat.com> - 381-1
+- Rebase to version 381
+- Resolves:rhbz#2210609
+
 * Tue May 16 2023 Tomas Korbar <tkorbar@redhat.com> - 380-1
 - Rebase to version 380
 - Resolves: rhbz#2204459