Compare commits

..

No commits in common. 'c9' and 'i10cs' have entirely different histories.
c9 ... i10cs

2
.gitignore vendored

@ -1 +1 @@
SOURCES/xterm-366.tgz
SOURCES/xterm-389.tgz

@ -1 +1 @@
1ec2fc8b5ee63d5a0d1c69cf7898624f280f6342 SOURCES/xterm-366.tgz
df125a278114906faa0d01c07b70b0bcdc46936e SOURCES/xterm-389.tgz

@ -0,0 +1,42 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
P46cd3aSov0rfNS/zg==
=cr15
-----END PGP PUBLIC KEY BLOCK-----

@ -0,0 +1,15 @@
-----BEGIN PGP SIGNATURE-----
Comment: See https://invisible-island.net/public/public.html for info
iQGzBAABCgAdFiEEGYgtkt2kxADCLA1WzCr0RyFnvgMFAmWTYlQACgkQzCr0RyFn
vgOWkgwAiajP5QDmjkbSo2M8IBbybObs0G18tlmeATnm3PO4izz1CDvi8jB0W0w4
wpVEpT4GxvxBR5kkhrmrqupTuS9HX3vXLnrX03KJdTTYXGuel2TB4KtFjG/pBEfG
C5hiukgzkSjeZKn8Upc6RoRGKDE/XUYg6e2TjE1sei4ltkp8wdrshzwgd5oYVt9d
OIZr6VscraRkU8BmutEstALGiXw7vznffRYuJeHuLT3sCqRQxXHRNBPk0YbTCGhz
Fjr9JetBweUxeHaPHObz8jgnyCuvbu3wI+C6F5MnDCJhsuIORksNKbHxY725Pq7j
DmSv8ritsSWvTbCpVk8cT6kDcAXlQ78W1PTFe6wz9XwtQt39/wSzxbPA8WxCTBUK
x5GHykKS4tWaiMagEoNXh93SktQNLo6oEkFbVO9z1jZzu8d9ExjUp575GUmTmzQ2
ekXgtWKkoAGE5Hmj2Z5TRwgqakWQ+oS/kXxKNLv1Jg1Z55aYqecGZemfnaH5P2lL
UZKUUD7q
=DLkz
-----END PGP SIGNATURE-----

@ -1,7 +1,8 @@
diff -up xterm-323/xterm.desktop.desk xterm-323/xterm.desktop
--- xterm-323/xterm.desktop.desk 2016-03-08 14:32:15.633422051 +0100
+++ xterm-323/xterm.desktop 2016-03-08 14:33:31.231604288 +0100
@@ -32,12 +32,12 @@
diff --git a/xterm.desktop b/xterm.desktop
index b6b27d0..e9a2c6c 100644
--- a/xterm.desktop
+++ b/xterm.desktop
@@ -32,13 +32,13 @@
# -----------------------------------------------------------------------------
[Desktop Entry]
Name=XTerm
@ -16,3 +17,4 @@ diff -up xterm-323/xterm.desktop.desk xterm-323/xterm.desktop
+Icon=xterm-color
Categories=System;TerminalEmulator;
Keywords=shell;prompt;command;commandline;cmd;
StartupWMClass=XTerm

@ -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.

@ -1,25 +1,28 @@
%bcond_with trace
Summary: Terminal emulator for the X Window System
Name: xterm
Version: 366
Release: 9%{?dist}
Version: 389
Release: 4%{?dist}
URL: https://invisible-island.net/xterm
License: MIT
License: MIT AND X11 AND HPND AND CC-BY-4.0
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)
Requires: xterm-resize = %{version}-%{release}
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
Patch3: xterm-man-paths.patch
%bcond_with trace
%global x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt)
%description
@ -35,6 +38,7 @@ 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
%patch 1 -p1 -b .defaults
@ -50,11 +54,9 @@ done
%configure \
--enable-meta-sends-esc \
--disable-backarrow-key \
--enable-256-color \
--enable-exec-xterm \
%{?with_trace: --enable-trace} \
--enable-warnings \
--enable-wide-chars \
--with-app-defaults=%{x11_app_defaults_dir} \
--with-icon-theme=hicolor \
--with-icondir=%{_datadir}/icons \
@ -62,6 +64,7 @@ done
--with-tty-group=tty \
--disable-full-tgetent \
--with-pcre2 \
--enable-readline-mouse \
--enable-logging
%make_build
@ -69,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
@ -102,34 +105,142 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
%{_mandir}/man1/resize.1*
%changelog
* Fri Mar 17 2023 Tomas Korbar <tkorbar@redhat.com> - 366-9
- Enable logging support
- Resolves: rhbz#2179054
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 389-4
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 389-3
- Rebuilt for MSVSphere 10
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 389-3
- Bump release for June 2024 mass rebuild
* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 389-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* 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
- Fix C compatibility issue in the configure script (#2251945)
* Wed Nov 01 2023 Tomas Korbar <tkorbar@redhat.com> - 388-2
- Add licenses to fully conform to SPDX
* Wed Oct 25 2023 Tomas Korbar <tkorbar@redhat.com> - 388-1
- Rebase to version 388
- Resolves: rhbz#2242865
* 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
* Tue Jul 11 2023 Tomas Korbar <tkorbar@redhat.com> - 384-1
- Rebase to version 384
- Resolves: rhbz#2221827
* Fri Jul 07 2023 Tomas Korbar <tkorbar@redhat.com> - 383-1
- Rebase to version 383
- Resolves: rhbz#2218033
* Wed May 31 2023 Tomas Korbar <tkorbar@redhat.com> - 382-1
- Rebase to version 382
- Resolves: rhbz#2211276
* 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
* Thu Mar 16 2023 Tomas Korbar <tkorbar@redhat.com> - 379-2
- Enable logging feature
* Sun Feb 19 2023 Tomas Korbar <tkorbar@redhat.com> - 379-1
- Rebase to version 379
- Resolves: rhbz#2170296
* Wed Feb 08 2023 Tomas Korbar <tkorbar@redhat.com> - 378-3
- Enable readline-mouse configuration option
- Resolves: rhbz#2166860
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 378-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jan 12 2023 Tomas Korbar <tkorbar@redhat.com> - 378-1
- Rebase to version 378
- Resolves: rhbz#2159449
* Thu Dec 08 2022 Tomas Korbar <tkorbar@redhat.com> - 377-1
- Rebase to version 377
- Remove unnecessary dependency on xterm-resize
- Resolves: rhbz#2143618
- Resolves: rhbz#2142751
* Mon Oct 31 2022 Tomas Korbar <tkorbar@redhat.com> - 375-1
- Rebase to version 375
- Resolves: rhbz#2137784
* Tue Oct 11 2022 Tomas Korbar <tkorbar@redhat.com> - 374-1
- Rebase to version 374
- Resolves: rhbz#2133585
* Wed Oct 05 2022 Tomas Korbar <tkorbar@redhat.com> - 373-1
- Rebase to version 373
- Resolves: rhbz#2129661
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 372-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Apr 25 2022 Tomas Korbar <tkorbar@redhat.com> - 372-1
- Rebase to version 372
- Resolves: rhbz#2062511
* Mon Feb 28 2022 Tomas Korbar <tkorbar@redhat.com> - 371-1
- Rebase to version 371
- Resolves: rhbz#2058442
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 370-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jan 07 2022 Thomas E. Dickey <dickey@invisible-island.net> - 370-2
- Trim configure options which are no longer necessary.
- Resolves: rhbz#2038247
* Tue Nov 30 2021 Tomas Korbar <tkorbar@redhat.com> - 370-1
- Rebase to version 370
- Resolves: rhbz#2023017
* Tue Feb 08 2022 Tomas Korbar <tkorbar@redhat.com> - 366-8
- disable sixel support
- Resolves: CVE-2022-24130
* Wed Sep 22 2021 Tomas Korbar <tkorbar@redhat.com> - 369-1
- Rebase to version 369
- Resolves: rhbz#2006589
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com>
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 368-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu 05 Aug 2021 Lukas Javorsky <ljavorsk@redhat.com> - 366-6
- Second rebuild against pcre2-10.37 (bug #1970765)
* Wed Jul 14 2021 Petr Pisar <ppisar@redhat.com> - 368-2
- Rebuild against pcre2-10.37 (bug #1965025)
* Thu Aug 05 2021 Tomas Korbar <tkorbar@redhat.com> - 366-5
- Rebuild because of missing gating configuration
- Related: rhbz#1970765
* Tue Jun 08 2021 Tomas Korbar <tkorbar@redhat.com> - 368-1
- Rebase to version 368
- Resolves: rhbz#1969214
* Wed Jul 28 2021 Lukas Javorsky <ljavorsk@redhat.com> - 366-4
- Rebuild against pcre2-10.37 (bug #1970765)
* Fri May 21 2021 Joe Orton <jorton@redhat.com> - 367-3
- drop luit support
* Tue Jun 01 2021 Tomas Korbar <tkorbar@redhat.com> - 366-3
- Drop luit support
- Resolves: rhbz#1959213
* Mon May 17 2021 Peter Hutterer <peter.hutterer@redhat.com> 367-2
- Add luit to Requires
- Resolves: rhbz#1959210
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 366-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Mon Apr 12 2021 Tomas Korbar <tkorbar@redhat.com> - 367-1
- Rebase to version 367
- Resolves: rhbz#1943741
* Thu Feb 11 2021 Tomas Korbar <tkorbar@redhat.com> - 366-1
- Rebase to version 366

Loading…
Cancel
Save