- update to 255

.cvsignore

@@ -1,2 +1,2 @@
 16colors.txt
-xterm-253.tgz
+xterm-255.tgz

sources

@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-363cc4865b7691bd0ae5eebb42cde9c9  xterm-253.tgz
+158c6b39ea8934a11e4376a3a9741252  xterm-255.tgz

xterm-255-man-page_paths.patch

@@ -1,15 +1,43 @@
---- xterm-226/xterm.man.man-page_paths	2007-06-13 23:19:59.000000000 +0200
+diff -up xterm-255/minstall.sh.man-page_paths xterm-255/minstall.sh
-+++ xterm-226/xterm.man	2007-06-21 16:06:15.000000000 +0200
+--- xterm-255/minstall.sh.man-page_paths	2010-01-20 11:55:42.000000000 +0100
-@@ -679,7 +679,7 @@ xterm -e /bin/bash -l -c "my command her
++++ xterm-255/minstall.sh	2010-02-02 17:52:11.000000000 +0100
- .RE
+@@ -74,9 +74,9 @@ MY_MANSECT=$suffix
- .IP
+ # are only a few common choices.  Note that they may not necessarily appear
- Finally, \fB-ls\fP is not completely ignored,
+ # in the same directories.  Prefer utmpx/wtmpx to utmp/wtmp, since that's
--because \fIxterm\ -ls\ -e\fP does write a \fI/etc/wtmp\fP entry
+ # the way the configure script is designed.
-+because \fIxterm\ -ls\ -e\fP does write a \fI/var/log/wtmp\fP entry
+-UTMP_NAME=utmp22
- (if configured to do so),
++UTMP_NAME=utmp
- whereas \fIxterm\ -e\fP does not.
+ UTMP_PATH=/etc
- .TP 8
+-for name in /etc /var/adm /var/log
-@@ -1575,17 +1575,17 @@ Since X11R6, bitmap fonts have been scal
++for name in /etc /var/adm /var/log /var/run
+ do
+ 	if test -f $name/utmpx ; then
+ 		UTMP_NAME=utmpx
+@@ -109,6 +109,10 @@ 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
+ 
++fontpath=/usr/share/X11/fonts
++xorgcfgdir=/etc/X11
++xorgcfgfil=xorg.conf
++X_MANSECT=7
+ sed	-e 's%__vendorversion__%"X Window System"%' \
+ 	-e s%__apploaddir__%$APPS_DIR% \
+ 	-e s%__mansuffix__%$MY_MANSECT%g \
+@@ -117,6 +121,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 \
++ 	-e s%__fontpath__%$fontpath%g \
++ 	-e s%__xorgcfgdir__%$xorgcfgdir%g \
++ 	-e s%__xorgcfgfil__%$xorgcfgfil%g \
+ 	$OLD_FILE >$NEW_FILE
+ 
+ echo "$MINSTALL $OLD_FILE $END_FILE"
+diff -up xterm-255/xterm.man.man-page_paths xterm-255/xterm.man
+--- xterm-255/xterm.man.man-page_paths	2010-01-20 11:55:58.000000000 +0100
++++ xterm-255/xterm.man	2010-02-02 17:50:29.000000000 +0100
+@@ -1701,17 +1701,17 @@ Since X11R6, bitmap fonts have been scal
  The font server claims to provide the bold font that \fIxterm\fP requests,
  but the result is not always readable.
  XFree86 provides a feature which can be used to suppress the scaling.
@@ -30,36 +58,3 @@
  .RE
  .IP
  Depending on your configuration, the font server may have its own configuration
-@@ -4596,10 +4596,10 @@ may be defined to a nonstandard location
- .SH FILES
- The actual pathnames given may differ on your system.
- .TP 5
--\fI/etc/utmp\fP
-+\fI/var/run/utmp\fP
- the system logfile, which records user logins.
- .TP 5
--\fI/etc/wtmp\fP
-+\fI/var/log/wtmp\fP
- the system logfile, which records user logins and logouts.
- .TP 5
- .I __apploaddir__/XTerm
---- xterm-226/minstall.sh.man-page_paths	2007-05-25 00:10:42.000000000 +0200
-+++ xterm-226/minstall.sh	2007-06-21 16:29:57.000000000 +0200
-@@ -26,10 +26,17 @@ MY_MANSECT=$suffix
- X_MANSECT=`man X 2>&1 | tr '\012' '\020' | sed -e 's/^[^0123456789]*\([^) ][^) ]*\).*/\1/'`
- test -z "$X_MANSECT" && X_MANSECT=$suffix
- 
-+fontpath=/usr/share/X11/fonts
-+xorgcfgdir=/etc/X11
-+xorgcfgfil=xorg.conf
-+X_MANSECT=7
- sed	-e 's%__vendorversion__%"X Window System"%' \
- 	-e s%__apploaddir__%$APPS_DIR% \
- 	-e s%__mansuffix__%$MY_MANSECT%g \
- 	-e s%__miscmansuffix__%$X_MANSECT%g \
-+ 	-e s%__fontpath__%$fontpath%g \
-+ 	-e s%__xorgcfgdir__%$xorgcfgdir%g \
-+ 	-e s%__xorgcfgfil__%$xorgcfgfil%g \
- 	$OLD_FILE >$NEW_FILE
- 
- echo "$MINSTALL $OLD_FILE $END_FILE"

xterm.spec

@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 253
+Version: 255
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -14,7 +14,7 @@ Source1: ftp://invisible-island.net/xterm/16colors.txt
 Source2: %{name}.desktop
 
 Patch1: xterm-245-resources.patch
-Patch3: xterm-226-man-page_paths.patch
+Patch3: xterm-255-man-page_paths.patch
 
 %bcond_with trace
 
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Tue Feb 02 2010 Miroslav Lichvar <mlichvar@redhat.com> 255-1
+- update to 255
+
 * Fri Dec 11 2009 Miroslav Lichvar <mlichvar@redhat.com> 253-1
 - update to 253