rpms/xterm/F-7 xterm-226-man-page_paths.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 sources, 1.19, 1.20 xterm.spec, 1.56, 1.57 xterm-222-man-page_paths.patch, 1.2, NONE

[Miroslav Lichvar (mlichvar)]

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27313

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


xterm-226-man-page_paths.patch:

--- NEW FILE xterm-226-man-page_paths.patch ---
--- xterm-226/xterm.man.man-page_paths	2007-06-13 23:19:59.000000000 +0200
+++ xterm-226/xterm.man	2007-06-21 16:06:15.000000000 +0200
@@ -679,7 +679,7 @@ xterm -e /bin/bash -l -c "my command her
 .RE
 .IP
 Finally, \fB-ls\fP is not completely ignored,
-because \fIxterm\ -ls\ -e\fP does write a \fI/etc/wtmp\fP entry
+because \fIxterm\ -ls\ -e\fP does write a \fI/var/log/wtmp\fP entry
 (if configured to do so),
 whereas \fIxterm\ -e\fP does not.
 .TP 8
@@ -1575,17 +1575,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
@@ -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"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-7/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	27 Mar 2007 15:27:19 -0000	1.19
+++ .cvsignore	22 Jun 2007 11:31:45 -0000	1.20
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-225.tgz
+xterm-226.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-7/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	27 Mar 2007 15:27:19 -0000	1.19
+++ sources	22 Jun 2007 11:31:45 -0000	1.20
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-dbd31341a9ccb982647416e8d27b0f00  xterm-225.tgz
+93d1f43ac3c13af86c598493f14a36f6  xterm-226.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-7/xterm.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- xterm.spec	12 Apr 2007 11:11:19 -0000	1.56
+++ xterm.spec	22 Jun 2007 11:31:45 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 225
-Release: 2%{?dist}
+Version: 226
+Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
 Group: User Interface/X
@@ -15,7 +15,7 @@
 
 Patch1: xterm-223-resources.patch
 Patch2: xterm-222-can-2003-0063.patch
-Patch3: xterm-222-man-page_paths.patch
+Patch3: xterm-226-man-page_paths.patch
 
 %{?!enable_trace:  %define enable_trace 0}
 
@@ -71,12 +71,16 @@
 %{_bindir}/uxterm
 %{_mandir}/man1/resize.1*
 %{_mandir}/man1/xterm.1*
-%{_datadir}/applications/*
+%{_datadir}/applications/fedora-xterm.desktop
+%{_datadir}/pixmaps/xterm*.xpm
 %{x11_app_defaults_dir}/UXTerm
 %{x11_app_defaults_dir}/XTerm
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Fri Jun 22 2007 Miroslav Lichvar <mlichvar at redhat.com> 226-1
+- update to 226
+
 * Thu Apr 12 2007 Miroslav Lichvar <mlichvar at redhat.com> 225-2
 - fix sections in man pages
 


--- xterm-222-man-page_paths.patch DELETED ---