[xterm/f18] update to 284
Miroslav Lichvar
mlichvar at fedoraproject.org
Mon Oct 15 10:50:42 UTC 2012
commit 0b67e2eed5363680ca288bc8c1bea2701549ca99
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date: Mon Oct 15 12:33:06 2012 +0200
update to 284
.gitignore | 2 +-
sources | 2 +-
xterm-man-paths.patch | 22 ++++++++++++----------
xterm-resources.patch | 21 +++++----------------
xterm.spec | 2 +-
5 files changed, 20 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fef62a5..06df480 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
/16colors.txt
-/xterm-283.tgz
+/xterm-284.tgz
diff --git a/sources b/sources
index 317653e..554c756 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
6093439b8d79089f4ff1cdfed358b401 16colors.txt
-678fb45f749216b11d57c4ffc935df65 xterm-283.tgz
+fa6bd90b91365f41c6bb895bee054c12 xterm-284.tgz
diff --git a/xterm-man-paths.patch b/xterm-man-paths.patch
index 8e79f7d..1050506 100644
--- a/xterm-man-paths.patch
+++ b/xterm-man-paths.patch
@@ -1,7 +1,7 @@
-diff -up xterm-283/minstall.in.man-paths xterm-283/minstall.in
---- xterm-283/minstall.in.man-paths 2012-10-09 01:02:57.000000000 +0200
-+++ xterm-283/minstall.in 2012-10-10 16:38:31.140469445 +0200
-@@ -116,11 +116,16 @@ WTMP_PATH=$WTMP_PATH/$WTMP_NAME
+diff -up xterm-284/minstall.in.man-paths xterm-284/minstall.in
+--- xterm-284/minstall.in.man-paths 2012-10-14 21:45:07.000000000 +0200
++++ xterm-284/minstall.in 2012-10-15 12:23:37.602431393 +0200
+@@ -118,12 +118,17 @@ WTMP_PATH=$WTMP_PATH/$WTMP_NAME
X_MANSECT=`man X 2>&1 | tr '\012' '\020' | sed -e 's/^[^0123456789]*\([^) ][^) ]*\).*/\1/'`
test -z "$X_MANSECT" && X_MANSECT=$suffix
@@ -15,11 +15,13 @@ diff -up xterm-283/minstall.in.man-paths xterm-283/minstall.in
sed -e 's%__vendorversion__%"X Window System"%' \
- -e "s%^\.ds N Xterm%.ds n $APP_Name%" \
+- -e "s%^\.ds n xterm%.ds N $APP_name%" \
+ -e "s%^\.ds N Xterm%.ds N $APP_Name%" \
- -e "s%^\.ds n xterm%.ds n $APP_name%" \
++ -e "s%^\.ds n xterm%.ds n $APP_name%" \
-e s%__default_termname__%@default_TERM@% \
-e s%__default_termid__%@default_termid@% \
-@@ -137,6 +142,9 @@ sed -e 's%__vendorversion__%"X Window Sy
+ -e s%__alt_sends_esc__%@alt_sends_esc@% \
+@@ -140,6 +145,9 @@ sed -e 's%__vendorversion__%"X Window Sy
-e s%/etc/utmp%$UTMP_PATH%g \
-e s%fIwtmp'\\%fI'$WTMP_NAME'\\%g' \
-e s%/etc/wtmp%$WTMP_PATH%g \
@@ -29,10 +31,10 @@ diff -up xterm-283/minstall.in.man-paths xterm-283/minstall.in
$OLD_FILE >$NEW_FILE
echo "$MINSTALL $OLD_FILE $END_FILE"
-diff -up xterm-283/xterm.man.man-paths xterm-283/xterm.man
---- xterm-283/xterm.man.man-paths 2012-10-09 00:58:12.000000000 +0200
-+++ xterm-283/xterm.man 2012-10-10 16:26:11.325842926 +0200
-@@ -1949,17 +1949,17 @@ Since X11R6, bitmap fonts have been scal
+diff -up xterm-284/xterm.man.man-paths xterm-284/xterm.man
+--- xterm-284/xterm.man.man-paths 2012-10-14 21:47:51.000000000 +0200
++++ xterm-284/xterm.man 2012-10-15 12:19:30.161179717 +0200
+@@ -1961,17 +1961,17 @@ 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-resources.patch b/xterm-resources.patch
index 9a49331..15c12a0 100644
--- a/xterm-resources.patch
+++ b/xterm-resources.patch
@@ -1,25 +1,14 @@
-diff -up xterm-283/XTerm.ad.resources xterm-283/XTerm.ad
---- xterm-283/XTerm.ad.resources 2011-07-11 12:52:16.000000000 +0200
-+++ xterm-283/XTerm.ad 2012-10-10 15:41:01.571707490 +0200
-@@ -254,3 +254,9 @@
+diff -up xterm-284/XTerm.ad.resources xterm-284/XTerm.ad
+--- xterm-284/XTerm.ad.resources 2011-07-11 12:52:16.000000000 +0200
++++ xterm-284/XTerm.ad 2012-10-15 12:25:24.390541803 +0200
+@@ -254,3 +254,10 @@
!*allowTcapOps: false
!*allowTitleOps: false
!*allowWindowOps: false
+
+! Red Hat Defaults:
+*allowFontOps: false
++*allowTcapOps: false
+*VT100*eightBitInput: false
+*VT100*scrollBar: true
+*VT100*utf8Title: true
-diff -up xterm-283/main.h.resources xterm-283/main.h
---- xterm-283/main.h.resources 2012-06-05 02:37:22.000000000 +0200
-+++ xterm-283/main.h 2012-10-10 15:05:47.200163396 +0200
-@@ -104,7 +104,7 @@
- #endif
-
- #ifndef DEF_ALLOW_TCAP
--#define DEF_ALLOW_TCAP True
-+#define DEF_ALLOW_TCAP False
- #endif
-
- #ifndef DEF_ALLOW_TITLE
diff --git a/xterm.spec b/xterm.spec
index b535d94..e46501f 100644
--- a/xterm.spec
+++ b/xterm.spec
@@ -1,6 +1,6 @@
Summary: Terminal emulator for the X Window System
Name: xterm
-Version: 283
+Version: 284
Release: 1%{?dist}
URL: http://invisible-island.net/xterm
License: MIT
More information about the scm-commits
mailing list