From d0925c19e40c747d4509f3bca5d746e32d1eadff Mon Sep 17 00:00:00 2001
From: Tomas Korbar <tkorbar@redhat.com>
Date: Wed, 4 Oct 2023 10:09:53 +0200
Subject: [PATCH] Rebase to version 385

Resolves: rhbz#2241681
---
 .gitignore            |  2 ++
 sources               |  4 ++--
 xterm-man-paths.patch | 14 +++++++-------
 xterm.spec            |  8 ++++++--
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9fdccdd..ce9e4bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,5 @@
 /xterm-383.tgz.asc
 /xterm-384.tgz
 /xterm-384.tgz.asc
+/xterm-385.tgz
+/xterm-385.tgz.asc
diff --git a/sources b/sources
index 0eaad74..d3962f7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (xterm-384.tgz) = f9fb2b3f4a58035dfa25063d4e401ca5a2f321d0eedb4cbaf92eeee38e92b4b107cc2f6520ef9c5e57a6cf2bc0f3363316af2b5840d89a0d6bda829ebe955ad8
-SHA512 (xterm-384.tgz.asc) = 91eec76c3a0a2359275aad40b1df32035cf73c2d461cebfbcf7c3af1bee4274b66364e29c07b4bef24db9627a944d8c81ac76f6cf3cea193b28edbf411080d60
+SHA512 (xterm-385.tgz) = e00601a91238b6f0dc6cb973c928387ef7c41a3244cdb463d931c23e0ff93a76498b0d17ea90656a6bed7fcf0a24a788f1cbc02f1ff73e3fbc5ad0540f4982f7
+SHA512 (xterm-385.tgz.asc) = c60550a65f2b866274c0be830972471c5c6e80c96020588aad5dcb4d6c4e48c3b974f1a0bea5af9fc57b0181f1cee631dbf7154d9827b5446343268cca60484e
 SHA512 (dickey@invisible-island.net-rsa3072.asc) = 19e19d3844b82d956ed01fc553bfbfcbd80f41a0ed2d51a2d0a6b9d2d5eede9482c9dba792f540c5cc386b8bf5d4a4a8da831edc42a2e50465fa42a3224b55af
diff --git a/xterm-man-paths.patch b/xterm-man-paths.patch
index d8ce611..be7c180 100644
--- a/xterm-man-paths.patch
+++ b/xterm-man-paths.patch
@@ -1,8 +1,8 @@
 diff --git a/minstall.in b/minstall.in
-index cd15775..a4b39a9 100644
+index ec3c936..e4f2911 100644
 --- a/minstall.in
 +++ b/minstall.in
-@@ -141,6 +141,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^.//'`
+@@ -109,6 +109,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^.//'`
  USE_Name=${USE_chr0}${USE_chr1}
  USE_NAME=`echo "$USE_name" | tr "$lower" "$upper"`
  
@@ -14,9 +14,9 @@ index cd15775..a4b39a9 100644
  sed	-e 's%__vendorversion__%"X Window System"%' \
  	-e 's%__app_version__%Patch\ \#'"$PATCH_NUM"% \
  	-e 's%__app_date__%'"$PATCH_YMD"% \
-@@ -167,6 +172,9 @@ sed	-e 's%__vendorversion__%"X Window System"%' \
- 	-e 's%fIwtmp\\%fI'$WTMP_NAME'\\%g' \
- 	-e "s%/etc/wtmp%$WTMP_PATH%g" \
+@@ -135,6 +140,9 @@ sed	-e 's%__vendorversion__%"X Window System"%' \
+ 	-e "s%__wtmp_name__%@WTMP_NAME@%g" \
+ 	-e "s%__wtmp_path__%@WTMP_PATH@%g" \
  	-e 's%/\\(\*\*%/*%g' \
 +	-e s%__fontpath__%$fontpath%g \
 +	-e s%__xorgcfgdir__%$xorgcfgdir%g \
@@ -25,10 +25,10 @@ index cd15775..a4b39a9 100644
  # diff -u $OLD_FILE $NEW_FILE
  
 diff --git a/xterm.man b/xterm.man
-index 14d97b8..bc76923 100644
+index 1792099..9b63f79 100644
 --- a/xterm.man
 +++ b/xterm.man
-@@ -2512,19 +2512,18 @@ Since X11R6, bitmap fonts have been scaled.
+@@ -2580,19 +2580,18 @@ Since X11R6, bitmap fonts have been scaled.
  The font server claims to provide the bold font that \fI\*n\fP requests,
  but the result is not always readable.
  XFree86 introduced a feature which can be used to suppress the scaling.
diff --git a/xterm.spec b/xterm.spec
index 3e923ba..67006e6 100644
--- a/xterm.spec
+++ b/xterm.spec
@@ -3,8 +3,8 @@
 
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 384
-Release: 2%{?dist}
+Version: 385
+Release: 1%{?dist}
 URL: https://invisible-island.net/xterm
 License: MIT
 BuildRequires: make
@@ -105,6 +105,10 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
 %{_mandir}/man1/resize.1*
 
 %changelog
+* Tue Oct 03 2023 Tomas Korbar <tkorbar@redhat.com> - 385-1
+- Rebase to version 385
+- Resolves: rhbz#2241681
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 384-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild