update to 273

This commit is contained in:
Miroslav Lichvar 2011-08-30 15:56:40 +02:00
parent e14adb9650
commit aa0216d235
4 changed files with 27 additions and 25 deletions

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
/16colors.txt /16colors.txt
/xterm-271.tgz /xterm-273.tgz

View File

@ -1,2 +1,2 @@
6093439b8d79089f4ff1cdfed358b401 16colors.txt 6093439b8d79089f4ff1cdfed358b401 16colors.txt
e07b05bd3d3a666a8cf086fcc8d227f3 xterm-271.tgz 82e2ec555c6c4e79fe1f8acd037bce54 xterm-273.tgz

View File

@ -1,7 +1,7 @@
diff -up xterm-271/minstall.sh.man-page_paths xterm-271/minstall.sh diff -up xterm-273/minstall.in.man-page_paths xterm-273/minstall.in
--- xterm-271/minstall.sh.man-page_paths 2010-03-04 00:44:49.000000000 +0100 --- xterm-273/minstall.in.man-page_paths 2011-08-16 11:50:03.000000000 +0200
+++ xterm-271/minstall.sh 2011-07-15 13:23:02.758313247 +0200 +++ xterm-273/minstall.in 2011-08-30 15:33:25.176170037 +0200
@@ -109,6 +109,10 @@ WTMP_PATH=$WTMP_PATH/$WTMP_NAME @@ -114,6 +114,10 @@ WTMP_PATH=$WTMP_PATH/$WTMP_NAME
X_MANSECT=`man X 2>&1 | tr '\012' '\020' | sed -e 's/^[^0123456789]*\([^) ][^) ]*\).*/\1/'` X_MANSECT=`man X 2>&1 | tr '\012' '\020' | sed -e 's/^[^0123456789]*\([^) ][^) ]*\).*/\1/'`
test -z "$X_MANSECT" && X_MANSECT=$suffix test -z "$X_MANSECT" && X_MANSECT=$suffix
@ -10,9 +10,9 @@ diff -up xterm-271/minstall.sh.man-page_paths xterm-271/minstall.sh
+xorgcfgfil=xorg.conf +xorgcfgfil=xorg.conf
+X_MANSECT=7 +X_MANSECT=7
sed -e 's%__vendorversion__%"X Window System"%' \ sed -e 's%__vendorversion__%"X Window System"%' \
-e s%__apploaddir__%$APPS_DIR% \ -e s%__default_termname__%@default_TERM@% \
-e s%__mansuffix__%$MY_MANSECT%g \ -e s%__default_termid__%@default_termid@% \
@@ -117,6 +121,9 @@ sed -e 's%__vendorversion__%"X Window Sy @@ -125,6 +129,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 \
@ -22,28 +22,27 @@ diff -up xterm-271/minstall.sh.man-page_paths xterm-271/minstall.sh
$OLD_FILE >$NEW_FILE $OLD_FILE >$NEW_FILE
echo "$MINSTALL $OLD_FILE $END_FILE" echo "$MINSTALL $OLD_FILE $END_FILE"
diff -up xterm-271/xterm.man.man-page_paths xterm-271/xterm.man diff -up xterm-273/xterm.man.man-page_paths xterm-273/xterm.man
--- xterm-271/xterm.man.man-page_paths 2011-07-13 10:59:37.000000000 +0200 --- xterm-273/xterm.man.man-page_paths 2011-08-23 02:50:07.000000000 +0200
+++ xterm-271/xterm.man 2011-07-15 13:27:51.653634499 +0200 +++ xterm-273/xterm.man 2011-08-30 15:29:15.593007964 +0200
@@ -1825,18 +1825,18 @@ Since X11R6, bitmap fonts have been scal @@ -1825,17 +1825,17 @@ Since X11R6, bitmap fonts have been scal
The font server claims to provide the bold font that \fIxterm\fP requests, The font server claims to provide the bold font that \fIxterm\fP requests,
but the result is not always readable. but the result is not always readable.
XFree86 provides 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\*(''), 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,
which comprise the fixed-pitch fonts that are used by \fIxterm\fP. which comprise the fixed-pitch fonts that are used by \fIxterm\fP.
For example For example
.RS .NS
-FontPath "/usr/lib/X11/fonts/misc/" -FontPath "/usr/lib/X11/fonts/misc/"
+FontPath "__fontpath__" +FontPath "__fontpath__"
.RE .NE
.IP
would become would become
.RS .NS
-FontPath "/usr/lib/X11/fonts/misc/:unscaled" -FontPath "/usr/lib/X11/fonts/misc/:unscaled"
+FontPath "__fontpath__/misc/:unscaled" +FontPath "__fontpath__/misc/:unscaled"
.RE .NE
.IP
Depending on your configuration, the font server may have its own configuration Depending on your configuration, the font server may have its own configuration
file.

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: 271 Version: 273
Release: 1%{?dist} Release: 1%{?dist}
URL: http://dickey.his.com/xterm URL: http://dickey.his.com/xterm
License: MIT License: MIT
@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
%{x11_app_defaults_dir}/XTerm* %{x11_app_defaults_dir}/XTerm*
%changelog %changelog
* Tue Aug 30 2011 Miroslav Lichvar <mlichvar@redhat.com> 273-1
- update to 273
* Fri Jul 15 2011 Miroslav Lichvar <mlichvar@redhat.com> 271-1 * Fri Jul 15 2011 Miroslav Lichvar <mlichvar@redhat.com> 271-1
- update to 271 - update to 271