- update to 256

- enable XKB Bell support (#568748)
This commit is contained in:
Miroslav Lichvar 2010-03-09 12:07:34 +00:00
parent b10971caa6
commit c57aeb3bc3
4 changed files with 19 additions and 27 deletions

View File

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

View File

@ -1,2 +1,2 @@
6093439b8d79089f4ff1cdfed358b401 16colors.txt
158c6b39ea8934a11e4376a3a9741252 xterm-255.tgz
6da5c166e1c633fc26917b66d6433f1f xterm-256.tgz

View File

@ -1,18 +1,6 @@
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
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
@ -34,10 +22,10 @@ diff -up xterm-255/minstall.sh.man-page_paths xterm-255/minstall.sh
$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
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.

View File

@ -1,6 +1,6 @@
Summary: Terminal emulator for the X Window System
Name: xterm
Version: 255
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-255-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@redhat.com> 256-1
- update to 256
- enable XKB Bell support (#568748)
* Tue Feb 02 2010 Miroslav Lichvar <mlichvar@redhat.com> 255-1
- update to 255