pool/xterm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 30090 from X11:terminals

Browse Source 
Copy from X11:terminals/xterm based on submit request 30090 from user msmeissn

OBS-URL: https://build.opensuse.org/request/show/30090
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xterm?expand=0&rev=35
This commit is contained in:
OBS User autobuild 2010-01-21 10:48:40 +00:00 committed by Git OBS Bridge
parent 215503d84c
commit 79649d882f
11 changed files with 343 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bug-246573-tentative-patch.diff
View File

@ -1,8 +1,8 @@
Index: xterm-242/fontutils.c
Index: xterm-254/fontutils.c
===================================================================
--- xterm-242.orig/fontutils.c
+++ xterm-242/fontutils.c
@@ -602,59 +602,19 @@ is_double_width_font(XFontStruct * fs)
--- xterm-254.orig/fontutils.c
+++ xterm-254/fontutils.c
@@ -634,59 +634,19 @@ is_double_width_font(XFontStruct * fs)
#endif
#if OPT_WIDE_CHARS && OPT_RENDERFONT && defined(HAVE_TYPE_FCCHAR32)

2
desktop.diff
View File

@ -2,7 +2,7 @@ Index: xterm.desktop
===================================================================
--- xterm.desktop.orig
+++ xterm.desktop
@@ -6,5 +6,5 @@ Exec=xterm
@@ -37,5 +37,5 @@ Exec=xterm
Terminal=false
Type=Application
Encoding=UTF-8

70
p_xterm-settings.diff
View File

@ -1,8 +1,8 @@
Index: xterm-242/UXTerm.ad
Index: xterm-254/UXTerm.ad
===================================================================
--- xterm-242.orig/UXTerm.ad
+++ xterm-242/UXTerm.ad
@@ -6,8 +6,19 @@
--- xterm-254.orig/UXTerm.ad
+++ xterm-254/UXTerm.ad
@@ -35,8 +35,19 @@
! to set resources for UTF-8 mode with corresponding fonts.
! See the uxterm script for an example.
@ -22,7 +22,7 @@ Index: xterm-242/UXTerm.ad
*fontMenu.Label: Unicode Fonts
*VT100.utf8: 1
@@ -31,12 +42,29 @@
@@ -60,12 +71,29 @@
! Making the wide fonts associated with *VT100.font in this file allows uxterm
! to skip that step. It will use the fonts that the XTerm file gives for the
! *VT100.uft8Fonts.font pattern.
@ -58,11 +58,11 @@ Index: xterm-242/UXTerm.ad
! Here is an alternate set of fonts with better support for bold:
!*VT100.font2: -efont-biwidth-medium-r-normal--10-100-75-75-p-50-iso10646-1
Index: xterm-242/XTerm-col.ad
Index: xterm-254/XTerm-col.ad
===================================================================
--- xterm-242.orig/XTerm-col.ad
+++ xterm-242/XTerm-col.ad
@@ -46,15 +46,15 @@
--- xterm-254.orig/XTerm-col.ad
+++ xterm-254/XTerm-col.ad
@@ -76,15 +76,15 @@
*VT100*color1: red3
*VT100*color2: green3
*VT100*color3: yellow3
@ -81,11 +81,11 @@ Index: xterm-242/XTerm-col.ad
*VT100*color13: magenta
*VT100*color14: cyan
*VT100*color15: white
Index: xterm-242/XTerm.ad
Index: xterm-254/XTerm.ad
===================================================================
--- xterm-242.orig/XTerm.ad
+++ xterm-242/XTerm.ad
@@ -67,21 +67,46 @@
--- xterm-254.orig/XTerm.ad
+++ xterm-254/XTerm.ad
@@ -98,21 +98,46 @@
*vtMenu*vthide*Label: Hide VT Window
*vtMenu*altscreen*Label: Show Alternate Screen
@ -139,7 +139,7 @@ Index: xterm-242/XTerm.ad
*fontMenu*fontescape*Label: Escape Sequence
*fontMenu*fontsel*Label: Selection
!fontescape and fontsel overridden by application
@@ -97,12 +122,13 @@
@@ -130,12 +155,13 @@
*fontMenu*allow-title-ops*Label: Allow Title Ops
*fontMenu*allow-window-ops*Label: Allow Window Ops
@ -159,7 +159,7 @@ Index: xterm-242/XTerm.ad
*tekMenu.Label: Tek Options
*tekMenu*tektextlarge*Label: Large Characters
@@ -193,6 +219,61 @@
@@ -226,6 +252,62 @@
! Alternatively,
!*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
@ -181,7 +181,7 @@ Index: xterm-242/XTerm.ad
+
+!! To be compatible with the original X Consortium XTerm.
+!! *oldXtermFKeys: true
+
+
+!! Some symbol mappings of the keyboard for foreign Motif. Some of these
+!! mappings are virtual osfKeySym's. Extend this list if necessary,
+!! more information in VirtualBindings(3) and /usr/include/Xm/XmStrDefs.h.
@ -218,45 +218,33 @@ Index: xterm-242/XTerm.ad
+!! Bug #52655
+*utf8Title: true
+
! vt100's and similar terminals recognize escape sequences and control
+
! VT100s and similar terminals recognize escape sequences and control
! characters to which they reply to the host with other escape sequences,
! to provide information. The "resize" program uses this feature.
Index: xterm-242/xterm.man
Index: xterm-254/xterm.man
===================================================================
--- xterm-242.orig/xterm.man
+++ xterm-242/xterm.man
@@ -1183,7 +1183,8 @@ Application specific resources (e.g., "\
--- xterm-254.orig/xterm.man
+++ xterm-254/xterm.man
@@ -1199,7 +1199,7 @@ Application specific resources (e.g., "\
Tie the VTxxx \fBbackarrowKey\fP and \fBptyInitialErase\fP resources
together by setting the DECBKM state according to whether the initial value of
stty erase is a backspace (8) or delete (127) character.
-The default is ``false'', which disables this feature.
+\" The default is ``false'', which disables this feature.
+The default is ``true'', which enables this feature.
-The default is \*(``false\*('', which disables this feature.
+The default is \*(``true\*('', which disables this feature.
.TP 8
.B "hold (\fPclass\fB Hold)"
If true,
@@ -2653,8 +2654,8 @@ always.
.RE
@@ -2877,7 +2877,7 @@ always.
.TP 8
.B "pointerShape (\fPclass\fB Cursor)"
-Specifies the name of the shape of the pointer.
-The default is ``xterm.''
+\" Specifies the name of the shape of the pointer. The default is ``xterm.''
+Specifies the name of the shape of the pointer. The default is ``top_left_arrow.''
Specifies the name of the shape of the pointer.
-The default is \*(``xterm.\*(''
+The default is \*(``top_left_arrow.\*(''
.TP 8
.B "popOnBell (\fPclass\fB PopOnBell)"
Specifies whether the window would be raised when Control-G is received.
@@ -2760,7 +2761,8 @@ The default is 64.
.B "scrollBar (\fPclass\fB ScrollBar)"
Specifies whether or not the scrollbar should be displayed.
The default is
-``false.''
+\" ``false.''
+``true.''
.TP 8
.B "scrollBarBorder (\fPclass\fB ScrollBarBorder)"
Specifies the width of the scrollbar border.
@@ -3015,9 +3017,13 @@ It is the XIM server's responsibility to
@@ -3288,9 +3288,13 @@ It is the XIM server's responsibility to
The XIM client must inform the XIM server of the cursor position.
For best results, the preedit string must be displayed with a proper font.
Therefore, \fIxterm\fP informs the XIM server of the proper font.

2
p_xterm-sigwinch.diff
View File

@ -2,7 +2,7 @@ Index: screen.c
===================================================================
--- screen.c.orig
+++ screen.c
@@ -1565,7 +1565,7 @@ ScreenResize(XtermWidget xw,
@@ -2056,7 +2056,7 @@ ScreenResize(XtermWidget xw,
TRACE(("return %d from SET_TTYSIZE %dx%d\n", code, rows, cols));
(void) code;

3
vttest-20091231.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8e1424c0ef0fae816d3c7ff277005ef13a6337d9178414447f6c877974bb4f4d
size 156636

3
vttest.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5fd08b0149d02c86b585c5b7f8350bbceebc538ff2f5d326b91e41b52bf56bec
size 111642

3
xterm-242.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:616d26415e1fb39eb5e6cdf19e5937d47d1befde1e185718061d0d9e3dea4970
size 702974

3
xterm-254.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7c2c34c7d11409960726ad09e605019481116799c7a849d49e16665090c8523b
size 746801

17
xterm-disallow-window-and-fonts-ops.patch
View File

@ -2,7 +2,7 @@ Index: XTerm.ad
===================================================================
--- XTerm.ad.orig
+++ XTerm.ad
@@ -219,6 +219,11 @@
@@ -252,6 +252,11 @@
! Alternatively,
!*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
@ -18,21 +18,12 @@ Index: xterm.man
===================================================================
--- xterm.man.orig
+++ xterm.man
@@ -1475,7 +1475,7 @@ The default is ``false.''
@@ -1499,7 +1499,7 @@ The default is \*(``true.\*(''
.TP
.B "allowFontOps (\fPclass\fB AllowFontOps)"
Specifies whether control sequences that set/query the font should be allowed.
-The default is ``true.''
+The default is ``false.''
-The default is \*(``true.\*(''
+The default is \*(``false.\*(''
.TP 8
.B "allowSendEvents (\fPclass\fB AllowSendEvents)"
Specifies whether or not synthetic key and button events (generated using
@@ -1517,7 +1517,7 @@ The default is ``true.''
.B "allowWindowOps (\fPclass\fB AllowWindowOps)"
Specifies whether extended window control sequences (as used in dtterm)
should be allowed.
-The default is ``true.''
+The default is ``false.''
.TP 8
.B "altIsNotMeta (\fPclass\fB AltIsNotMeta\fP)"
If ``true'', treat the Alt-key as if it were the Meta-key.

292
xterm.changes
View File

@ -1,3 +1,295 @@
-------------------------------------------------------------------
Fri Jan 15 17:13:30 CET 2010 - meissner@suse.de
- Patch #254 - 2010/1/6
* add a configure-check to eliminate install-ti rule from Makefile
when the system has no tic (terminfo compiler) program. This lets
one use the install-full rule more consistently.
* amend change to WriteText() function in patch #252 to take into
account the colorAttrMode resource (report by Krzysztof Kotlenga).
* document titleModes resource in manpage, added in patch #252.
* modify tcap-query table entries for shifted up/down cursor keys
to match ncurses convention.
* improve lookup of termcap-query data, allowing for duplicate
keycodes versus missing entries.
* add control sequence which can be used to modify the terminal data
used for the termcap-keyboard.
* improve portability of tcap-query feature, using terminfo functions
in preference to termcap on systems having terminfo.
* improve font-setting/querying control (OSC 50):
o when TrueType font is selected, the TrueType faceName will
be set, rather than the bitmap font.
o when TrueType font is selected, querying returns the name
of the TrueType font.
o querying a font recognizes the relative-font convention that
setting a font could use.
* add menu-entry for allowColorOps.
* add new resources for fine-tuning menu entries: allowColorOps,
disallowedColorOps, disallowedFontOps and disallowedTcapOps.
* correct logic for disabling the "TrueType Fonts" menu item; it
was not ensuring that the faceName resource value was non-empty.
* implement VT520-style controls DECSMBV and DECSWBV for setting
the margin- and warning-bell volume.
* fix a minor error from patch #243 which made the zIconBeep feature
use a minor-error tone rather than an informational tone.
* add a null-pointer check for the case where renderFont resource is
true, but faceName resource is unset, used in logic to strip "xft:"
prefix from patch #251 changes (patch by Michael Riepe).
* add special case to configure CF_XOPEN_SOURCE macro to use
extensions on Darwin (patch by Dennis Preiser).
* improve configure checks for regular expressions header and library
* update config.guess, config.sub
- Patch #253 - 2009/12/10
* add a null-pointer check in getPrinterFlags() per changes in patch #252.
* add a null-pointer check, needed in UTF-8 mode for Xft fonts after
changes in patch #252 (patch by Alan Coopersmith).
* correct size when clearing struct for tek4014 (patch by Jochen Voss).
* parenthesize expression in MoreRows macro, fixing a limit check
added in patch #251 (Debian #560039).
- Patch #252 - 2009/12/7
* modify title-querying logic to support retrieval of titles encoded using UTF-8.
* add new "title-modes" control sequence for controlling whether
window/icon titles can be set or queried using UTF-8, optionally
encoded in a hexadecimal string.
* use mkdir -p rather than mkdirs.sh (prompted by discussion of mawk
by Aleksey Cheusov).
* add appropriate copyright/license notices to the bulk of files
lacking same, and modify to use identical terms in others which used
different wording. The main exceptions are the files contributed
by Markus Kuhn, who appears to prefer public domain distribution,
noting that I have modified/improved several of these without
changing the terms of distribution (request by Jari Aalto).
* add control sequences for resetting the "dynamic" colors to their
default values.
* add control sequences for resetting the "special" colors to their
default values.
* add control sequences for setting the "special" colors such as
colorBD (bold).
* add overlooked case for setting highlight foreground color with
the dynamic-colors control.
* add OSC 104, for resetting ANSI/16/88/256 colors to default.
* reset ANSI/16/88/256 colors to default in soft/hard reset functions.
* strip "xft:" prefix from faceName and faceNameDoublesize resource values,
* add DECSCUSR (discussion with Andy Koppe).
* add check/warning on failure to load font, to see if the name looks
like an Xft pattern rather than XLFD. This can happen if someone
happens to modify their X resource settings for programs that read
data from xterm's namespace.
* modify handling of print and print-everything actions to allow
the various printer flags to be overridden by supplying parameters.
* add resource printerNewLine (request by Ovidiu Gheorghioiu).
* minor cleanup, finish using TScreenOf() and TekScreenOf() macros introduced in patch #224.
* improve checks in ShowCursor/HideCursor to get the background color,
particularly when highlightReverse resource is used (reports by
Jan Engelhardt, Christian Weisgerber).
* correct checkVeryBoldAttr to omit comparison of foreground color
to special color values used for color<XX> resources (report by
Jan Engelhardt).
* make colorBDMode and colorULMode resources work with TrueType
configuration (report by Jan Engelhardt).
- Patch #251 - 2009/11/11
* add window-ops controls to push/pop icon and/or window labels on a stack.
* minor fixes to align termcap file with terminfo.
* add resource disallowedWindowOps, to allow fine-tuning of features
to suppress with the allowWindowOps resource (prompted by discussion
with Bram Moolenaar).
* add makefile rules for resize-manpage to pdf, etc.
* further improve limit-checks in select/paste (Mandriva #54531).
- Patch #250 - 2009/10/13
* add check and error-message for fonts that have no printable values
in the ISO-8859-1 range (Debian #542434).
* some compiler-warning cleanup, in particular workaround for
defective implementation of gcc's attribute warn_unused_result
(report by Bram Moolenaar).
* improve estimate of single-column width for packed TrueType fonts
by ignoring extents for codes 127 and 159.
* improve line-drawing for TrueType fonts which happen to have defined
glyphs which are not line-drawing in 0..31 by assuming they're not,
and just checking the existence of the Unicode codepoints. This
makes it more likely that the user can override a misconfigured
font using the "Line-Drawing Characters" menu entry.
* limit minimum cell-width for packed font to maximum-advance reported
by Xft. Some fonts are wider than that, even in the Latin-1 range
(Debian #550497).
* add list of direct-contributors in "THANKS" file.
* stylistic changes to this file to help scripted extraction of list
of contributors.
* correct off-by-one in okPosition fix from patch #249 limit-checks
which prevented double-click selection on the bottom line of the
screen (reports by Rajeev V. Pillai, Debian #550368).
* add -q option to vttest/256colors2.pl and vttest/88colors2.pl to
demonstrate bulk initialization of color palette.
* improve the workaround from patch #188 by enabling resources for
the 88-color model.
* document in xterm manpage the limited availability of resources
color16 to color255 as noted in patch #188 (Ubuntu #438850).
- Patch #249 - 2009/10/1
* change default for allowWindowOps resource to false.
* add limit-checks for result of visual_width() function, needed
from patch #242 and exposed by #244 changes (Debian #548321).
* improve limit-checks in select/paste.
* fix a remaining bug from patch #230 changes for displaying
multi-column characters in a proportional font (report by Chris
Jones).
* add new resource forcePackedFont and menu entry "Packed Font" to
control whether to use the font's minimum (default) or maximum width
when those differ. The workaround which xterm uses to accommodate
proportional fonts is not necessary with certain fonts such as
unifont which happen to store a mixture of multicolumn glyphs
(report by Chris Jones).
* fix an (old) bug which did not restart the timer for blinking
text if the only blinking text was temporarily scrolled out of view,
e.g., using the scrollbar.
* fix an (old) flaw in the delete-line operation where the text
which is scrolled into view while the display is scrolled up was
not repainted.
* improve delete-line and insert-line operations, retaining selection
when the selection does not intersect the deleted/inserted lines.
* fix an (old) off-by-one error when an application cleared above
the cursor position while the display was scrolled up, that would
leave an extra line of text uncleared.
* fix a similar problem where the double-size attribute would not
be reset when clearing the screen while the display was scrolled up.
* fix an indexing error which would occur if an application cleared
a line while the display was scrolled up and was also in UTF-8 mode
(Redhat #524503). The error was from patch #228 but more visible
after changes from patch #244.
- Patch #248 - 2009/9/11
* fix an overlooked adjustment for selecting double-width characters
in the narrow-character configuration.
* eliminate uses of XTERM_CELL and XTERM_CELLC where an appropriate
LineData pointer is available.
* correct expression in okScrnRow macro, making selections give the
length of lines below the visible screen (report by Stuart Henderson).
* correct logic used to improve performance of missing-glyph check,
which did not handle line-drawing characters (Debian #545220).
- Patch #247 - 2009/8/30
* add ifdef's and check for openpty() on DragonFly (patch by Alex
Hornung).
* correct calculation for size of line's data block, which was
sometimes off-by-one when configured using --enable-16bit-chars
(report by H Merijn Brand).
* fix indexing error in print-everything feature from patch #246
(patch by Ovidiu Gheorghioiu).
- Patch #246 - 2009/8/16
* remove obsolete logic for saving/restoring wrapping flags, which did
not work on 64-bit platform. Wrapping flags (stored in the
line-index) are now copied with line-data (Debian #541160).
* modify comments in app-defaults files to avoid problem with C
preprocessor used by xrdb (Debian #541603).
* restore special case in makeColorPair, needed for colorBDMode
resource (Debian #541089).
* correct SetLineFlags() macro, broken in patch #244 when recoding
to avoid gcc-specific bitfields (Debian #541236).
* modify initialization of screen buffers to ensure that pointers
align to int-boundaries. This fixes a problem introduced in patch
#244 where the color- and character-arrays (stored after the
video-attributes in each row) might be misaligned (report by Rajeev
V Pillai).
* add limit-check in ScrnRefresh for handling saved-lines from the
circular buffer which are repainted on a screen whose width has
increased. To improve performance, circular buffer entries are
not resized (report by Rajeev V Pillai).
* correct type for CellColor (a late change in patch #244 to avoid
gcc-specifc enums made that unsigned rather than unsigned short,
for the 256-color option).
* fix typo in configure option --enable-16bit-chars (report by Rajeev
V. Pillai).
- Patch #245 - 2009/8/12
* correct a special case in saving FIFO-lines from patch #244. If
the screen was shrunk, xterm used the wrong amount for copying to
FIFO-lines, and then used this amount to adjust the current row
on the screen. That was both a visible defect (Debian #541109)
as well as a potential addressing error (Debian #541132, #541160,
and #541236).
* add clarification in xterm manual about the various allowXXXOps
resources, which are disabled when the allowSendEvents resource
is active (patch by Julien Cristau, Debian #531597).
- Patch #244 - 2009/8/9
* refactored storage of saved-lines, providing a configure
option to manage them as a FIFO (actually a circular buffer),
improving performance. Added configure option --enable-fifo-lines
to enable/disable the new feature (it is enabled by default).
* added fastScroll resource, to amuse people who measure terminal
emulator performance by cat'ing large files to the screen.
* modify check in readPtyData from return values to provide exit
on zero-bytes read from pty for FreeBSD, or eliminate high-CPU
in "xterm-hold" processing (discussion with Ulrich Spoerlein,
FreeBSD ports/136686). The check was originally modified to combine
negative/zero values in XFree86-3.1.2E, 1996/05/06.
* add configure option --enable-16bit-chars to provide wide-characters
with 1account whether they are double-width (report by Guilbert
Stabilo on comp.unix.shell).
* add capability for keypad-center (kb2/KA2) to termcap entry
for xterm-new, as well as xterm-8bit, xterm-sun and xterm-vt220
(FreeBSD conf/136336).
* change default for keepSelection resource to true (prompted by
discussion with David Muir Sharnoff).
* remove a limit-check in ptydata.c, allowing Unicode values past
64k to be displayed using TrueType fonts (Debian #458432).
* remove a vt52-specific ifdef to allow mapping F1-F4 to PF1-PF4
when vt52 support is not compiled (report by Olaf 'Rhialto' Seibert).
* save/restore line-wrapping flags when converting from ISO-8859-1
encoding to UTF-8 encoding, as well as when resizing screen.
* remove extra adjustment of position in fix for Debian #418324.
* modify default check for mkWidth resource to check for line-drawing
characters, which are categorized as double-width in Solaris 10
(report by Sebastian Kayser).
* add "print-everything" action (patch by Ovidiu Gheorghioiu).
* start refactoring scrollback data using new getLineData() function.
* demote recent change to Debian #252873 fix to experimental,
ifdef'd out as EXP_BOGUS_FG (Debian #522141).
* work around groff mapping of ASCII quotes using macros (requested
by Reuben Thomas based on Colin Watson advice, fixes Debian #378700).
* correct symbol used for default of allowWindowOps which was
DEF_ALLOW_FONT rather than DEF_ALLOW_WINDOW (report by Matthieu
Herrb).
* amend fix for tek4014 from patch #243 to make it only apply to
the Tek Options menu.
Patch #243 - 2009/3/28
* revert change to default for allowTcapOps (request by Bram Moolenaar).
* reallocate result returned by xtermEnvLocale() to avoid reference
to freed memory after handling menuLocale resource.
* fix an old (X11R5) bug in tek4014 for switching fontsizes.
* add resource defaultString to make configurable the use of "#"
when pastes of UTF-8 text fail due to limitations in the current
locale settings.
* make the set of selection target Atom's configurable by two new
resources eightBitSelectTypes and utf8SelectTypes, e.g., to use the
TEXT Atom in preference to UTF8_STRING (discussion with Stanislav
Sedov regarding koi8rxterm and the FreeBSD port).
* modify handling of TARGETS Atom by making it return exactly the
set of targets as those which xterm is currently providing.
* set MANPAGER and PAGER explicitly to /bin/cat in minstall.sh
to work around /etc/man.conf's with those variables already set
(report by Марьясин Семён).
* improve error-checking of tcap-query parser.
* add check for keyboard tcap), which ensures that terminal
descriptions containing the same string for shifted/unshifted keys
will be seen by tcap-query as only the unshifted key. (This would
only happen with an incorrect terminal description).
* fix conversion for input event-state to modifier-parameter which
made tcap-query feature not work with tcapFunctionKeys (keyboard
type tcap).
* add "DEF_ALLOW_XXX" definitions to main.h to allow overriding the
default compiled-in values for "allowxxx" resources.
* remove check on bell-percentage added in patch #242, which
disallowed zero/negative values (Redhat Bugzilla #487829).
- Updated vttest to 20091231 snapshot.
-------------------------------------------------------------------
Wed Dec 16 00:18:56 CET 2009 - jengelh@medozas.de

12
xterm.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package xterm (Version 242)
# spec file for package xterm (Version 254)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -26,8 +26,8 @@ License: MIT
Group: System/X11/Utilities
Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm
AutoReqProv: on
Version: 242
Release: 3
Version: 254
Release: 1
Summary: The basic X terminal program
Source: ftp://invisible-island.net/xterm/%name-%version.tar.bz2
Source1: luitx
@ -35,7 +35,7 @@ Source3: Backarrow2Delete
Source4: Backarrow2BackSpace
Source5: README.SuSE
Source6: terminal.png
Source7: vttest.tar.gz
Source7: vttest-20091231.tgz
Source8: 20x20ja.bdf.bz2
Source9: 20x20ko.bdf.bz2
# Snoop for the escape sequence assignment of the keypad
@ -74,7 +74,7 @@ bunzip2 *.bdf.bz2
--with-tty-group=tty \
--with-app-defaults=/usr/share/X11/app-defaults
make %{?_smp_mflags}
pushd ../vttest-20050107
pushd ../vttest-20091231
%configure
make %{?_smp_mflags}
popd
@ -95,7 +95,7 @@ else
install -m 644 terminfo $RPM_BUILD_ROOT/usr/X11R6/lib/X11/etc/xterm.terminfo
install -m 644 termcap $RPM_BUILD_ROOT/usr/X11R6/lib/X11/etc/xterm.termcap
fi
pushd ../vttest-20050107
pushd ../vttest-20091231
make install DESTDIR=$RPM_BUILD_ROOT
popd
install -m 755 $RPM_SOURCE_DIR/luitx $RPM_BUILD_ROOT/usr/bin