From ac17d6eb9fa075562434cdfb2f08e6f71e79dfbb Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 1 Jun 2017 16:44:13 +0200 Subject: [PATCH] update to 328 --- .gitignore | 2 +- sources | 2 +- xterm-man-paths.patch | 18 +++++++++--------- xterm.spec | 7 +++++-- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index c0ba17d..1bafcb2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/xterm-327.tgz +/xterm-328.tgz diff --git a/sources b/sources index 6ef31d7..38db6dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c32e931adcad44e64e57892e75d9e02 xterm-327.tgz +SHA512 (xterm-328.tgz) = 4f3381440394e0cd2d6c4d6645573ab2eac1c1c98e510eb0b3281ed4d2b1082e57ae58b7f756a03704eb275925ae497a1ae6c5907d6ba1b8ec95f92eaf939656 diff --git a/xterm-man-paths.patch b/xterm-man-paths.patch index f92a47d..9c66ae6 100644 --- a/xterm-man-paths.patch +++ b/xterm-man-paths.patch @@ -1,6 +1,6 @@ -diff -up xterm-313/minstall.in.man-paths xterm-313/minstall.in ---- xterm-313/minstall.in.man-paths 2014-02-28 00:43:50.000000000 +0100 -+++ xterm-313/minstall.in 2014-12-08 11:47:33.071962479 +0100 +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/^ USE_Name=${USE_chr0}${USE_chr1} USE_NAME=`echo "$USE_name" | tr '[a-z]' '[A-Z]'` @@ -13,20 +13,20 @@ diff -up xterm-313/minstall.in.man-paths xterm-313/minstall.in sed -e 's%__vendorversion__%"X Window System"%' \ -e 's%__app_version__%Patch\ \#'$PATCH_NUM% \ -e 's%__app_date__%'$PATCH_YMD% \ -@@ -161,6 +166,9 @@ sed -e 's%__vendorversion__%"X Window Sy - -e s%/etc/utmp%$UTMP_PATH%g \ +@@ -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%/\\(\*\*%/*%g' \ + -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-313/xterm.man.man-paths xterm-313/xterm.man ---- xterm-313/xterm.man.man-paths 2014-12-08 11:47:33.072962481 +0100 -+++ xterm-313/xterm.man 2014-12-08 11:50:03.248282304 +0100 -@@ -2096,19 +2096,18 @@ Since X11R6, bitmap fonts have been scal +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 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 93a3ab3..adf51fa 100644 --- a/xterm.spec +++ b/xterm.spec @@ -1,7 +1,7 @@ Summary: Terminal emulator for the X Window System Name: xterm -Version: 327 -Release: 3%{?dist} +Version: 328 +Release: 1%{?dist} URL: http://invisible-island.net/xterm License: MIT Group: User Interface/X @@ -113,6 +113,9 @@ fi %{_mandir}/man1/resize.1* %changelog +* Thu Jun 01 2017 Miroslav Lichvar 328-1 +- update to 328 + * Mon Feb 06 2017 Miroslav Lichvar 327-3 - recommend xorg-x11-fonts-misc (#487499)