update to 283
This commit is contained in:
Miroslav Lichvar
parent
78b4cb8648
commit
ffca35f991
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
/16colors.txt
|
||||
/xterm-278.tgz
|
||||
/xterm-283.tgz
|
||||
|
||||
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
6093439b8d79089f4ff1cdfed358b401 16colors.txt
|
||||
3eeddfe35cb0a2db1924cfe0c20be443 xterm-278.tgz
|
||||
678fb45f749216b11d57c4ffc935df65 xterm-283.tgz
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
diff -up xterm-261/xterm.desktop.desk xterm-261/xterm.desktop
|
||||
--- xterm-261/xterm.desktop.desk 2010-06-15 12:58:13.000000000 +0200
|
||||
+++ xterm-261/xterm.desktop 2010-07-02 13:02:56.000000000 +0200
|
||||
@@ -32,10 +32,11 @@
|
||||
diff -up xterm-283/xterm.desktop.desk xterm-283/xterm.desktop
|
||||
--- xterm-283/xterm.desktop.desk 2012-06-25 00:20:29.000000000 +0200
|
||||
+++ xterm-283/xterm.desktop 2012-10-09 17:58:12.342769072 +0200
|
||||
@@ -32,11 +32,11 @@
|
||||
# -----------------------------------------------------------------------------
|
||||
[Desktop Entry]
|
||||
Name=XTerm
|
||||
-#GenericName=Terminal
|
||||
+GenericName=Terminal
|
||||
Comment=standard terminal emulator for the X window system
|
||||
Exec=xterm
|
||||
@ -1,7 +1,7 @@
|
||||
diff -up xterm-273/minstall.in.man-page_paths xterm-273/minstall.in
|
||||
--- xterm-273/minstall.in.man-page_paths 2011-08-16 11:50:03.000000000 +0200
|
||||
+++ xterm-273/minstall.in 2011-08-30 15:33:25.176170037 +0200
|
||||
@@ -114,6 +114,10 @@ WTMP_PATH=$WTMP_PATH/$WTMP_NAME
|
||||
diff -up xterm-283/minstall.in.man-paths xterm-283/minstall.in
|
||||
--- xterm-283/minstall.in.man-paths 2012-10-09 01:02:57.000000000 +0200
|
||||
+++ xterm-283/minstall.in 2012-10-10 16:38:31.140469445 +0200
|
||||
@@ -116,11 +116,16 @@ 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
|
||||
|
||||
@ -9,10 +9,17 @@ diff -up xterm-273/minstall.in.man-page_paths xterm-273/minstall.in
|
||||
+xorgcfgdir=/etc/X11
|
||||
+xorgcfgfil=xorg.conf
|
||||
+X_MANSECT=7
|
||||
+
|
||||
# Provide for renaming in test-builds:
|
||||
APP_Name=`echo "$APP_name" | sed -e s/xterm/Xterm/`
|
||||
|
||||
sed -e 's%__vendorversion__%"X Window System"%' \
|
||||
- -e "s%^\.ds N Xterm%.ds n $APP_Name%" \
|
||||
+ -e "s%^\.ds N Xterm%.ds N $APP_Name%" \
|
||||
-e "s%^\.ds n xterm%.ds n $APP_name%" \
|
||||
-e s%__default_termname__%@default_TERM@% \
|
||||
-e s%__default_termid__%@default_termid@% \
|
||||
@@ -125,6 +129,9 @@ sed -e 's%__vendorversion__%"X Window Sy
|
||||
@@ -137,6 +142,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 \
|
||||
@ -22,22 +29,22 @@ diff -up xterm-273/minstall.in.man-page_paths xterm-273/minstall.in
|
||||
$OLD_FILE >$NEW_FILE
|
||||
|
||||
echo "$MINSTALL $OLD_FILE $END_FILE"
|
||||
diff -up xterm-273/xterm.man.man-page_paths xterm-273/xterm.man
|
||||
--- xterm-273/xterm.man.man-page_paths 2011-08-23 02:50:07.000000000 +0200
|
||||
+++ xterm-273/xterm.man 2011-08-30 15:29:15.593007964 +0200
|
||||
@@ -1825,17 +1825,17 @@ Since X11R6, bitmap fonts have been scal
|
||||
The font server claims to provide the bold font that \fIxterm\fP requests,
|
||||
diff -up xterm-283/xterm.man.man-paths xterm-283/xterm.man
|
||||
--- xterm-283/xterm.man.man-paths 2012-10-09 00:58:12.000000000 +0200
|
||||
+++ xterm-283/xterm.man 2012-10-10 16:26:11.325842926 +0200
|
||||
@@ -1949,17 +1949,17 @@ Since X11R6, bitmap fonts have been scal
|
||||
The font server claims to provide the bold font that \fI\*n\fP requests,
|
||||
but the result is not always readable.
|
||||
XFree86 introduced 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.
|
||||
which comprise the fixed-pitch fonts that are used by \fI\*n\fP.
|
||||
For example
|
||||
.NS
|
||||
-FontPath "/usr/lib/X11/fonts/misc/"
|
||||
+FontPath "__fontpath__"
|
||||
+FontPath "__fontpath__/misc/"
|
||||
.NE
|
||||
would become
|
||||
.NS
|
||||
14
xterm.spec
14
xterm.spec
@ -1,7 +1,7 @@
|
||||
Summary: Terminal emulator for the X Window System
|
||||
Name: xterm
|
||||
Version: 278
|
||||
Release: 4%{?dist}
|
||||
Version: 283
|
||||
Release: 1%{?dist}
|
||||
URL: http://invisible-island.net/xterm
|
||||
License: MIT
|
||||
Group: User Interface/X
|
||||
@ -14,12 +14,12 @@ Source0: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
|
||||
Source1: ftp://invisible-island.net/xterm/16colors.txt
|
||||
|
||||
Patch1: xterm-245-resources.patch
|
||||
Patch2: xterm-261-desk.patch
|
||||
Patch3: xterm-271-man-page_paths.patch
|
||||
Patch2: xterm-desktop.patch
|
||||
Patch3: xterm-man-paths.patch
|
||||
|
||||
%bcond_with trace
|
||||
|
||||
%define x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt)
|
||||
%global x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt)
|
||||
|
||||
%description
|
||||
The xterm program is a terminal emulator for the X Window System. It
|
||||
@ -31,7 +31,7 @@ programs that can't use the window system directly.
|
||||
|
||||
%patch1 -p1 -b .resources
|
||||
%patch2 -p1 -b .desk
|
||||
%patch3 -p1 -b .man-page_paths
|
||||
%patch3 -p1 -b .man-paths
|
||||
|
||||
for f in THANKS; do
|
||||
iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
|
||||
@ -79,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_mandir}/man1/uxterm.1*
|
||||
%{_mandir}/man1/xterm.1*
|
||||
%{_datadir}/applications/fedora-xterm.desktop
|
||||
%{_datadir}/pixmaps/xterm*.xpm
|
||||
%{_datadir}/pixmaps/*xterm*.xpm
|
||||
%{x11_app_defaults_dir}/KOI8RXTerm*
|
||||
%{x11_app_defaults_dir}/UXTerm*
|
||||
%{x11_app_defaults_dir}/XTerm*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user