diff --git a/16colors.txt b/16colors.txt deleted file mode 100644 index 9b09e77f20d08088f191560a4a2c5ceb0cd90b3a..0000000000000000000000000000000000000000 --- a/16colors.txt +++ /dev/null @@ -1,24 +0,0 @@ -ANSI-Colors v1.0 -(c)1994 by: Pablo Ariel Kohan - |3 9 3 9 3 9 3 9 3 9 3 9 3 9 3 9| - |0 0 1 1 2 2 3 3 4 4 5 5 6 6 7 7| ----+-------------------------------+--- -040|X X X X X X X X X X X X X X X X|040 -100|X X X X X X X X X X X X X X X X|100 -041|X X X X X X X X X X X X X X X X|041 -101|X X X X X X X X X X X X X X X X|101 -042|X X X X X X X X X X X X X X X X|042 -102|X X X X X X X X X X X X X X X X|102 -043|X X X X X X X X X X X X X X X X|043 -103|X X X X X X X X X X X X X X X X|103 -044|X X X X X X X X X X X X X X X X|044 -104|X X X X X X X X X X X X X X X X|104 -045|X X X X X X X X X X X X X X X X|045 -105|X X X X X X X X X X X X X X X X|105 -046|X X X X X X X X X X X X X X X X|046 -106|X X X X X X X X X X X X X X X X|106 -047|X X X X X X X X X X X X X X X X|047 -107|X X X X X X X X X X X X X X X X|107 ----+-------------------------------+--- - |3 9 3 9 3 9 3 9 3 9 3 9 3 9 3 9| - |0 0 1 1 2 2 3 3 4 4 5 5 6 6 7 7| diff --git a/xterm-defaults.patch b/xterm-defaults.patch deleted file mode 100644 index 4e1c7ecbb23e033d2d2b324aed9f94cfda101ec9..0000000000000000000000000000000000000000 --- a/xterm-defaults.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up xterm-333/XTerm.ad.defaults xterm-333/XTerm.ad ---- xterm-333/XTerm.ad.defaults 2016-12-22 03:07:39.000000000 +0100 -+++ xterm-333/XTerm.ad 2018-05-30 15:44:53.325426803 +0200 -@@ -259,3 +259,11 @@ - !*allowTcapOps: false - !*allowTitleOps: false - !*allowWindowOps: false -+ -+! Red Hat Defaults: -+*allowFontOps: false -+*allowTcapOps: false -+*VT100*eightBitInput: false -+*VT100*scrollBar: true -+*VT100*utf8Title: true -+*termName: xterm-256color diff --git a/xterm-desktop.patch b/xterm-desktop.patch deleted file mode 100644 index 56895dd0e4682fe44150eb10e778c32d730cc976..0000000000000000000000000000000000000000 --- a/xterm-desktop.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up xterm-323/xterm.desktop.desk xterm-323/xterm.desktop ---- xterm-323/xterm.desktop.desk 2016-03-08 14:32:15.633422051 +0100 -+++ xterm-323/xterm.desktop 2016-03-08 14:33:31.231604288 +0100 -@@ -32,12 +32,12 @@ - # ----------------------------------------------------------------------------- - [Desktop Entry] - Name=XTerm --#GenericName=Terminal -+GenericName=Terminal - Comment=standard terminal emulator for the X window system - Exec=xterm - Terminal=false - Type=Application - Encoding=UTF-8 --Icon=xterm-color_48x48 -+Icon=xterm-color - Categories=System;TerminalEmulator; - Keywords=shell;prompt;command;commandline;cmd; diff --git a/xterm-man-paths.patch b/xterm-man-paths.patch deleted file mode 100644 index 9c66ae634ab7afa1436ca34ed40149ac445da9e3..0000000000000000000000000000000000000000 --- a/xterm-man-paths.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -up xterm-328/minstall.in.man-paths xterm-328/minstall.in ---- xterm-328/minstall.in.man-paths 2016-10-25 00:29:20.000000000 +0200 -+++ xterm-328/minstall.in 2017-06-01 16:36:26.544065282 +0200 -@@ -138,6 +138,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^ - USE_Name=${USE_chr0}${USE_chr1} - USE_NAME=`echo "$USE_name" | tr '[a-z]' '[A-Z]'` - -+fontpath=/usr/share/X11/fonts -+xorgcfgdir=/etc/X11 -+xorgcfgfil=xorg.conf -+X_MANSECT=7 -+ - sed -e 's%__vendorversion__%"X Window System"%' \ - -e 's%__app_version__%Patch\ \#'$PATCH_NUM% \ - -e 's%__app_date__%'$PATCH_YMD% \ -@@ -163,6 +168,9 @@ sed -e 's%__vendorversion__%"X Window Sy - -e s%fIwtmp'\\%fI'$WTMP_NAME'\\%g' \ - -e s%/etc/wtmp%$WTMP_PATH%g \ - -e 's%/\\(\*\*%/*%g' \ -+ -e s%__fontpath__%$fontpath%g \ -+ -e s%__xorgcfgdir__%$xorgcfgdir%g \ -+ -e s%__xorgcfgfil__%$xorgcfgfil%g \ - $OLD_FILE >$NEW_FILE - # diff -u $OLD_FILE $NEW_FILE - -diff -up xterm-328/xterm.man.man-paths xterm-328/xterm.man ---- xterm-328/xterm.man.man-paths 2017-05-31 00:57:12.000000000 +0200 -+++ xterm-328/xterm.man 2017-06-01 16:33:16.493512367 +0200 -@@ -2328,19 +2328,18 @@ 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\*('' --or \*(``/etc/X11/xorg.conf\*(''), 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 \fI\*n\fP. - For example - .NS --FontPath "/usr/lib/X11/fonts/misc/" -+FontPath "__fontpath__/misc/" - .NE - .IP - would become - .NS --FontPath "/usr/lib/X11/fonts/misc/:unscaled" -+FontPath "__fontpath__/misc/:unscaled" - .NE - .IP - Depending on your configuration, the font server may have its own configuration diff --git a/xterm.spec b/xterm.spec index 3ad6998dd101e3046f0b11b0243a76e53706677d..0733d1fbbadc39747b06c8188aaef15ee3a48d81 100644 --- a/xterm.spec +++ b/xterm.spec @@ -1,14 +1,10 @@ Name: xterm Version: 334 -Release: 3 +Release: 4 Summary: It is a terminal emulator for the X Window System License: MIT -URL: https://invisible-island.net/xterm -Source0: ftp://ftp.invisible-island.net/xterm/xterm-334.tgz -Source1: ftp://ftp.invisible-island.net/xterm/16colors.txt -Patch0: xterm-defaults.patch -Patch1: xterm-desktop.patch -Patch2: xterm-man-paths.patch +URL: http://invisible-island.net/xterm +Source0: http://invisible-island.net/xterm/xterm-334.tgz BuildRequires: gcc git pkgconfig ncurses-devel libutempter-devel BuildRequires: libXft-devel libXaw-devel libXext-devel desktop-file-utils @@ -47,13 +43,12 @@ touch -r THANKS TEMP; mv TEMP THANKS %install %make_install -cp -fp %{SOURCE1} 16colors.txt desktop-file-install --dir=%{buildroot}/%{_datadir}/applications xterm.desktop mkdir -p %{buildroot}/%{_datadir}/appdata install -m 644 -p xterm.appdata.xml %{buildroot}/%{_datadir}/appdata %files -%doc 16colors.txt THANKS +%doc THANKS %{_bindir}/*xterm %{_datadir}/X11/app-defaults/* %{_datadir}/appdata/xterm.appdata.xml @@ -67,6 +62,12 @@ install -m 644 -p xterm.appdata.xml %{buildroot}/%{_datadir}/appdata %{_mandir}/man1/* %changelog +* Thu Jan 3 2020 openEuler Buildteam - 334-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:optimization the spec + * Mon Sep 30 2019 luhuaxin - 334-3 - Type: enhancement - ID: NA