diff --git a/.gitignore b/.gitignore index 848b547..479ae0f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /xterm-361.tgz /xterm-362.tgz /xterm-363.tgz +/xterm-364.tgz diff --git a/sources b/sources index 24fb920..52eddb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xterm-363.tgz) = e9148f144e5e38597c84ccd82033f4fb83a9dd222c4cecf7498e31065e7d0148c89631290e5f804fcd9d2d55f59f4fd271aaf220eb636fbe38ae245ea6537871 +SHA512 (xterm-364.tgz) = c9363a4f64622729a8c954833956bf4019eb69dfc6e7b448be7f0dbf4ac5a56788a32d14f952e2c5021efd9c02e5390dadfbd9a11332a7a1c11c1e43972cd28d diff --git a/xterm-man-paths.patch b/xterm-man-paths.patch index 9c66ae6..d8ce611 100644 --- a/xterm-man-paths.patch +++ b/xterm-man-paths.patch @@ -1,9 +1,10 @@ -diff -up xterm-328/minstall.in.man-paths xterm-328/minstall.in ---- xterm-328/minstall.in.man-paths 2016-10-25 00:29:20.000000000 +0200 -+++ xterm-328/minstall.in 2017-06-01 16:36:26.544065282 +0200 -@@ -138,6 +138,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^ +diff --git a/minstall.in b/minstall.in +index cd15775..a4b39a9 100644 +--- a/minstall.in ++++ b/minstall.in +@@ -141,6 +141,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^.//'` USE_Name=${USE_chr0}${USE_chr1} - USE_NAME=`echo "$USE_name" | tr '[a-z]' '[A-Z]'` + USE_NAME=`echo "$USE_name" | tr "$lower" "$upper"` +fontpath=/usr/share/X11/fonts +xorgcfgdir=/etc/X11 @@ -11,22 +12,23 @@ diff -up xterm-328/minstall.in.man-paths xterm-328/minstall.in +X_MANSECT=7 + sed -e 's%__vendorversion__%"X Window System"%' \ - -e 's%__app_version__%Patch\ \#'$PATCH_NUM% \ - -e 's%__app_date__%'$PATCH_YMD% \ -@@ -163,6 +168,9 @@ sed -e 's%__vendorversion__%"X Window Sy - -e s%fIwtmp'\\%fI'$WTMP_NAME'\\%g' \ - -e s%/etc/wtmp%$WTMP_PATH%g \ + -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" \ -e 's%/\\(\*\*%/*%g' \ -+ -e s%__fontpath__%$fontpath%g \ -+ -e s%__xorgcfgdir__%$xorgcfgdir%g \ -+ -e s%__xorgcfgfil__%$xorgcfgfil%g \ - $OLD_FILE >$NEW_FILE ++ -e s%__fontpath__%$fontpath%g \ ++ -e s%__xorgcfgdir__%$xorgcfgdir%g \ ++ -e s%__xorgcfgfil__%$xorgcfgfil%g \ + "$OLD_FILE" >$NEW_FILE # diff -u $OLD_FILE $NEW_FILE -diff -up xterm-328/xterm.man.man-paths xterm-328/xterm.man ---- xterm-328/xterm.man.man-paths 2017-05-31 00:57:12.000000000 +0200 -+++ xterm-328/xterm.man 2017-06-01 16:33:16.493512367 +0200 -@@ -2328,19 +2328,18 @@ Since X11R6, bitmap fonts have been scal +diff --git a/xterm.man b/xterm.man +index 14d97b8..bc76923 100644 +--- a/xterm.man ++++ b/xterm.man +@@ -2512,19 +2512,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 f3e0643..37737bd 100644 --- a/xterm.spec +++ b/xterm.spec @@ -1,13 +1,13 @@ Summary: Terminal emulator for the X Window System Name: xterm -Version: 363 +Version: 364 Release: 1%{?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 +BuildRequires: libxkbfile-devel luit pcre2-devel pkgconfig(libpcre2-posix) Requires: xterm-resize = %{version}-%{release} Recommends: xorg-x11-fonts-misc @@ -62,7 +62,8 @@ done --with-utempter \ --with-tty-group=tty \ --disable-full-tgetent \ - --enable-sixel-graphics + --enable-sixel-graphics \ + --with-pcre2 %make_build @@ -102,6 +103,13 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata %{_mandir}/man1/resize.1* %changelog +* Wed Feb 03 2021 Tomas Korbar - 364-1 +- Rebase to version 364 (#1924362) +- Build with pcre2 support (#1909609) + +* Thu Jan 28 2021 Fedora Release Engineering - 363-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jan 19 2021 Tomas Korbar - 363-1 - Rebase to version 363 (#1910995) - Build with pcre2 support (#1909609)