update to 313

This commit is contained in:
Miroslav Lichvar 2014-12-08 11:57:13 +01:00
parent bb2873806b
commit ef7fef7106
4 changed files with 17 additions and 13 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/xterm-312.tgz /xterm-313.tgz

View File

@ -1 +1 @@
e42f09b2f59efa862367967241d56306 xterm-312.tgz 4c2e85f46d8a96c81daf3f9e6c2e1997 xterm-313.tgz

View File

@ -1,7 +1,7 @@
diff -up xterm-288/minstall.in.man-paths xterm-288/minstall.in diff -up xterm-313/minstall.in.man-paths xterm-313/minstall.in
--- xterm-288/minstall.in.man-paths 2013-01-01 02:18:24.000000000 +0100 --- xterm-313/minstall.in.man-paths 2014-02-28 00:43:50.000000000 +0100
+++ xterm-288/minstall.in 2013-01-10 12:29:33.472774530 +0100 +++ xterm-313/minstall.in 2014-12-08 11:47:33.071962479 +0100
@@ -136,6 +136,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^ @@ -138,6 +138,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^
USE_Name=${USE_chr0}${USE_chr1} USE_Name=${USE_chr0}${USE_chr1}
USE_NAME=`echo "$USE_name" | tr '[a-z]' '[A-Z]'` USE_NAME=`echo "$USE_name" | tr '[a-z]' '[A-Z]'`
@ -13,7 +13,7 @@ diff -up xterm-288/minstall.in.man-paths xterm-288/minstall.in
sed -e 's%__vendorversion__%"X Window System"%' \ sed -e 's%__vendorversion__%"X Window System"%' \
-e 's%__app_version__%Patch\ \#'$PATCH_NUM% \ -e 's%__app_version__%Patch\ \#'$PATCH_NUM% \
-e 's%__app_date__%'$PATCH_YMD% \ -e 's%__app_date__%'$PATCH_YMD% \
@@ -159,6 +164,9 @@ sed -e 's%__vendorversion__%"X Window Sy @@ -161,6 +166,9 @@ sed -e 's%__vendorversion__%"X Window Sy
-e s%/etc/utmp%$UTMP_PATH%g \ -e s%/etc/utmp%$UTMP_PATH%g \
-e s%fIwtmp'\\%fI'$WTMP_NAME'\\%g' \ -e s%fIwtmp'\\%fI'$WTMP_NAME'\\%g' \
-e s%/etc/wtmp%$WTMP_PATH%g \ -e s%/etc/wtmp%$WTMP_PATH%g \
@ -23,14 +23,15 @@ diff -up xterm-288/minstall.in.man-paths xterm-288/minstall.in
$OLD_FILE >$NEW_FILE $OLD_FILE >$NEW_FILE
# diff -u $OLD_FILE $NEW_FILE # diff -u $OLD_FILE $NEW_FILE
diff -up xterm-288/xterm.man.man-paths xterm-288/xterm.man diff -up xterm-313/xterm.man.man-paths xterm-313/xterm.man
--- xterm-288/xterm.man.man-paths 2013-01-01 00:36:19.000000000 +0100 --- xterm-313/xterm.man.man-paths 2014-12-08 11:47:33.072962481 +0100
+++ xterm-288/xterm.man 2013-01-10 12:28:15.852693216 +0100 +++ xterm-313/xterm.man 2014-12-08 11:50:03.248282304 +0100
@@ -1970,18 +1970,18 @@ Since X11R6, bitmap fonts have been scal @@ -2096,19 +2096,18 @@ Since X11R6, bitmap fonts have been scal
The font server claims to provide the bold font that \fI\*n\fP requests, The font server claims to provide the bold font that \fI\*n\fP requests,
but the result is not always readable. but the result is not always readable.
XFree86 introduced a feature which can be used to suppress the scaling. XFree86 introduced a feature which can be used to suppress the scaling.
-In the X server's configuration file (e.g., \*(``/etc/X11/XFree86\*(''), you -In the X server's configuration file (e.g., \*(``/etc/X11/XFree86\*(''
-or \*(``/etc/X11/xorg.conf\*(''), you
+In the X server's configuration file (e.g., \*(``__xorgcfgdir__/__xorgcfgfil__\*(''), you +In the X server's configuration file (e.g., \*(``__xorgcfgdir__/__xorgcfgfil__\*(''), you
can add \*(``:unscaled\*('' to the end of the directory specification for the can add \*(``:unscaled\*('' to the end of the directory specification for the
\*(``misc\*('' fonts, \*(``misc\*('' fonts,

View File

@ -1,6 +1,6 @@
Summary: Terminal emulator for the X Window System Summary: Terminal emulator for the X Window System
Name: xterm Name: xterm
Version: 312 Version: 313
Release: 1%{?dist} Release: 1%{?dist}
URL: http://invisible-island.net/xterm URL: http://invisible-island.net/xterm
License: MIT License: MIT
@ -102,6 +102,9 @@ fi
%{x11_app_defaults_dir}/XTerm* %{x11_app_defaults_dir}/XTerm*
%changelog %changelog
* Mon Dec 08 2014 Miroslav Lichvar <mlichvar@redhat.com> 313-1
- update to 313
* Mon Sep 29 2014 Miroslav Lichvar <mlichvar@redhat.com> 312-1 * Mon Sep 29 2014 Miroslav Lichvar <mlichvar@redhat.com> 312-1
- update to 312 - update to 312