rpms/xterm/F-12 xterm-256-man-page_paths.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 sources, 1.39, 1.40 xterm.spec, 1.80, 1.81 xterm-226-man-page_paths.patch, 1.1, NONE

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1693

Modified Files:
	.cvsignore sources xterm.spec 
Added Files:
	xterm-256-man-page_paths.patch 
Removed Files:
	xterm-226-man-page_paths.patch 
Log Message:
- update to 256
- enable XKB Bell support (#568748)


xterm-256-man-page_paths.patch:
 minstall.sh |    7 +++++++
 xterm.man   |    6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE xterm-256-man-page_paths.patch ---
diff -up xterm-256/minstall.sh.man-page_paths xterm-256/minstall.sh
--- xterm-256/minstall.sh.man-page_paths	2010-03-04 00:44:49.000000000 +0100
+++ xterm-256/minstall.sh	2010-03-09 12:11:26.000000000 +0100
@@ -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-256/xterm.man.man-page_paths xterm-256/xterm.man
--- xterm-256/xterm.man.man-page_paths	2010-03-03 23:30:35.000000000 +0100
+++ xterm-256/xterm.man	2010-03-09 12:11:26.000000000 +0100
@@ -1699,17 +1699,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/F-12/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	11 Dec 2009 12:10:11 -0000	1.39
+++ .cvsignore	9 Mar 2010 12:11:21 -0000	1.40
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-253.tgz
+xterm-256.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-12/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	11 Dec 2009 12:10:11 -0000	1.39
+++ sources	9 Mar 2010 12:11:21 -0000	1.40
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-363cc4865b7691bd0ae5eebb42cde9c9  xterm-253.tgz
+6da5c166e1c633fc26917b66d6433f1f  xterm-256.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-12/xterm.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- xterm.spec	11 Dec 2009 12:10:11 -0000	1.80
+++ xterm.spec	9 Mar 2010 12:11:22 -0000	1.81
@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 253
+Version: 256
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -8,13 +8,14 @@ Group: User Interface/X
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: imake pkgconfig ncurses-devel libutempter-devel
 BuildRequires: libXft-devel libXaw-devel libXext-devel desktop-file-utils
+BuildRequires: libxkbfile-devel
 
 Source0: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
 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-256-man-page_paths.patch
 
 %bcond_with trace
 
@@ -72,12 +73,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xterm.1*
 %{_datadir}/applications/fedora-xterm.desktop
 %{_datadir}/pixmaps/xterm*.xpm
-%{x11_app_defaults_dir}/KOI8RXTerm
-%{x11_app_defaults_dir}/UXTerm
-%{x11_app_defaults_dir}/XTerm
-%{x11_app_defaults_dir}/XTerm-color
+%{x11_app_defaults_dir}/KOI8RXTerm*
+%{x11_app_defaults_dir}/UXTerm*
+%{x11_app_defaults_dir}/XTerm*
 
 %changelog
+* Tue Mar 09 2010 Miroslav Lichvar <mlichvar at redhat.com> 256-1
+- update to 256
+- enable XKB Bell support (#568748)
+
 * Fri Dec 11 2009 Miroslav Lichvar <mlichvar at redhat.com> 253-1
 - update to 253
 


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