rpms/xterm/devel xterm-255-man-page_paths.patch, NONE, 1.1 .cvsignore, 1.42, 1.43 sources, 1.42, 1.43 xterm.spec, 1.84, 1.85 xterm-226-man-page_paths.patch, 1.1, NONE

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11628

Modified Files:
	.cvsignore sources xterm.spec 
Added Files:
	xterm-255-man-page_paths.patch 
Removed Files:
	xterm-226-man-page_paths.patch 
Log Message:
- update to 255


xterm-255-man-page_paths.patch:
 minstall.sh |   11 +++++++++--
 xterm.man   |    6 +++---
 2 files changed, 12 insertions(+), 5 deletions(-)

--- NEW FILE xterm-255-man-page_paths.patch ---
diff -up xterm-255/minstall.sh.man-page_paths xterm-255/minstall.sh
--- xterm-255/minstall.sh.man-page_paths	2010-01-20 11:55:42.000000000 +0100
+++ xterm-255/minstall.sh	2010-02-02 17:52:11.000000000 +0100
@@ -74,9 +74,9 @@ MY_MANSECT=$suffix
 # are only a few common choices.  Note that they may not necessarily appear
 # in the same directories.  Prefer utmpx/wtmpx to utmp/wtmp, since that's
 # the way the configure script is designed.
-UTMP_NAME=utmp22
+UTMP_NAME=utmp
 UTMP_PATH=/etc
-for name in /etc /var/adm /var/log
+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.
-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
 can add ":unscaled" to the end of the directory specification for the
 "misc" fonts, which comprise the fixed-pitch fonts that are used by \fIxterm\fP.
 For example
 .RS
-	FontPath	"/usr/lib/X11/fonts/misc/"
+	FontPath	"__fontpath__"
 .RE
 .IP
 would become
 .RS
-	FontPath	"/usr/lib/X11/fonts/misc/:unscaled"
+	FontPath	"__fontpath__/misc/:unscaled"
 .RE
 .IP
 Depending on your configuration, the font server may have its own configuration


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	11 Dec 2009 12:04:09 -0000	1.42
+++ .cvsignore	2 Feb 2010 17:29:15 -0000	1.43
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-253.tgz
+xterm-255.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	11 Dec 2009 12:04:09 -0000	1.42
+++ sources	2 Feb 2010 17:29:15 -0000	1.43
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-363cc4865b7691bd0ae5eebb42cde9c9  xterm-253.tgz
+158c6b39ea8934a11e4376a3a9741252  xterm-255.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- xterm.spec	11 Dec 2009 12:04:09 -0000	1.84
+++ xterm.spec	2 Feb 2010 17:29:15 -0000	1.85
@@ -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/xter
 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 at redhat.com> 255-1
+- update to 255
+
 * Fri Dec 11 2009 Miroslav Lichvar <mlichvar at redhat.com> 253-1
 - update to 253
 


--- xterm-226-man-page_paths.patch DELETED ---