diff --git a/.gitignore b/.gitignore index 3d549eb..7b7853e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,66 +1 @@ -/xterm-346.tgz -/xterm-348.tgz -/xterm-349.tgz -/xterm-350.tgz -/xterm-351.tgz -/xterm-353.tgz -/xterm-354.tgz -/xterm-356.tgz -/xterm-357.tgz -/xterm-358.tgz -/xterm-359.tgz -/xterm-360.tgz -/xterm-361.tgz -/xterm-362.tgz -/xterm-363.tgz -/xterm-364.tgz -/xterm-366.tgz -/xterm-367.tgz -/xterm-368.tgz -/xterm-369.tgz -/xterm-370.tgz -/xterm-371.tgz -/xterm-372.tgz -/xterm-373.tgz -/xterm-374.tgz -/xterm-375.tgz -/xterm-377.tgz -/xterm-378.tgz -/xterm-379.tgz -/xterm-380.tgz -/xterm-381.tgz -/xterm-381.tgz.asc -/xterm-382.tgz -/xterm-382.tgz.asc -/xterm-383.tgz -/xterm-383.tgz.asc -/xterm-384.tgz -/xterm-384.tgz.asc -/xterm-385.tgz -/xterm-385.tgz.asc -/xterm-388.tgz -/xterm-388.tgz.asc -/xterm-389.tgz -/xterm-389.tgz.asc -/xterm-390.tgz -/xterm-390.tgz.asc -/xterm-392.tgz -/xterm-392.tgz.asc -/xterm-393.tgz -/xterm-393.tgz.asc -/xterm-394.tgz -/xterm-394.tgz.asc -/xterm-395.tgz -/xterm-395.tgz.asc -/xterm-397.tgz -/xterm-397.tgz.asc -/xterm-399.tgz -/xterm-399.tgz.asc -/xterm-401.tgz -/xterm-401.tgz.asc -/xterm-406.tgz -/xterm-406.tgz.asc -/xterm-410.tgz.asc -/xterm-410.tgz -/xterm-411.tgz -/xterm-411.tgz.asc +/xterm-331.tgz diff --git a/dickey@invisible-island.net-rsa3072.asc b/dickey@invisible-island.net-rsa3072.asc deleted file mode 100644 index a44002a..0000000 --- a/dickey@invisible-island.net-rsa3072.asc +++ /dev/null @@ -1,88 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -b/Q= -=WuBN ------END PGP PUBLIC KEY BLOCK----- diff --git a/sources b/sources index e64bad7..24a5e05 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (xterm-411.tgz) = 62dda0f252d73ae958c8635d3616837aed3a4fd41f20804775c78429cdcf8685ffb9e6995732479709d6a44ac579012f7473531e51d92558231a8d3edfcb69c9 -SHA512 (xterm-411.tgz.asc) = c291f094b7eb9078f4285c1e762a7ceba7995529773e0cbc1509dee13b426e710c9122d28f8567aca6220d00552c4999810ee1842f11983aa11692d622c22c70 +SHA512 (xterm-331.tgz) = 88229d682553d4780c7b9c081bba6396f319ecd17461dd344478ae6456e35aff9d7a7411d863d35a03886d9a6b082b5d3325fbb990cea22cb82970173f6f3347 diff --git a/xterm-configure-c99.patch b/xterm-configure-c99.patch deleted file mode 100644 index 65c6bc0..0000000 --- a/xterm-configure-c99.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur xterm-388.orig/aclocal.m4 xterm-388/aclocal.m4 ---- xterm-388.orig/aclocal.m4 2023-10-02 23:23:32.000000000 +0200 -+++ xterm-388/aclocal.m4 2023-11-28 15:32:31.790171161 +0100 -@@ -4759,7 +4759,7 @@ - int x = (XkbBI_Info |XkbBI_MinorError |XkbBI_MajorError |XkbBI_TerminalBell |XkbBI_MarginBell); - Atom y = 0; - (void)x; -- XkbBell((Display *)0, (Widget)0, 0, y); -+ XkbBell((Display *)0, (Window)0, 0, y); - ],[cf_cv_xkb_bell_ext=yes],[cf_cv_xkb_bell_ext=no]) - ]) - test "$cf_cv_xkb_bell_ext" = yes && AC_DEFINE(HAVE_XKB_BELL_EXT,1,[Define 1 if we have XKB Bell extension]) -diff -ur xterm-388.orig/configure xterm-388/configure ---- xterm-388.orig/configure 2023-10-08 23:26:36.000000000 +0200 -+++ xterm-388/configure 2023-11-28 15:32:53.598984387 +0100 -@@ -17023,7 +17023,7 @@ - int x = (XkbBI_Info |XkbBI_MinorError |XkbBI_MajorError |XkbBI_TerminalBell |XkbBI_MarginBell); - Atom y = 0; - (void)x; -- XkbBell((Display *)0, (Widget)0, 0, y); -+ XkbBell((Display *)0, (Window)0, 0, y); - - ; - return 0; diff --git a/xterm-defaults.patch b/xterm-defaults.patch deleted file mode 100644 index 4e1c7ec..0000000 --- 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 index affbd88..56895dd 100644 --- a/xterm-desktop.patch +++ b/xterm-desktop.patch @@ -1,8 +1,7 @@ -diff --git a/xterm.desktop b/xterm.desktop -index b6b27d0..e9a2c6c 100644 ---- a/xterm.desktop -+++ b/xterm.desktop -@@ -32,13 +32,13 @@ +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 @@ -17,4 +16,3 @@ index b6b27d0..e9a2c6c 100644 +Icon=xterm-color Categories=System;TerminalEmulator; Keywords=shell;prompt;command;commandline;cmd; - StartupWMClass=XTerm diff --git a/xterm-man-paths.patch b/xterm-man-paths.patch index be7c180..9c66ae6 100644 --- a/xterm-man-paths.patch +++ b/xterm-man-paths.patch @@ -1,10 +1,9 @@ -diff --git a/minstall.in b/minstall.in -index ec3c936..e4f2911 100644 ---- a/minstall.in -+++ b/minstall.in -@@ -109,6 +109,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^.//'` +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 "$lower" "$upper"` + USE_NAME=`echo "$USE_name" | tr '[a-z]' '[A-Z]'` +fontpath=/usr/share/X11/fonts +xorgcfgdir=/etc/X11 @@ -12,23 +11,22 @@ index ec3c936..e4f2911 100644 +X_MANSECT=7 + sed -e 's%__vendorversion__%"X Window System"%' \ - -e 's%__app_version__%Patch\ \#'"$PATCH_NUM"% \ - -e 's%__app_date__%'"$PATCH_YMD"% \ -@@ -135,6 +140,9 @@ sed -e 's%__vendorversion__%"X Window System"%' \ - -e "s%__wtmp_name__%@WTMP_NAME@%g" \ - -e "s%__wtmp_path__%@WTMP_PATH@%g" \ + -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 ++ -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 --git a/xterm.man b/xterm.man -index 1792099..9b63f79 100644 ---- a/xterm.man -+++ b/xterm.man -@@ -2580,19 +2580,18 @@ Since X11R6, bitmap fonts have been scaled. +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. diff --git a/xterm-resources.patch b/xterm-resources.patch new file mode 100644 index 0000000..15c12a0 --- /dev/null +++ b/xterm-resources.patch @@ -0,0 +1,14 @@ +diff -up xterm-284/XTerm.ad.resources xterm-284/XTerm.ad +--- xterm-284/XTerm.ad.resources 2011-07-11 12:52:16.000000000 +0200 ++++ xterm-284/XTerm.ad 2012-10-15 12:25:24.390541803 +0200 +@@ -254,3 +254,10 @@ + !*allowTcapOps: false + !*allowTitleOps: false + !*allowWindowOps: false ++ ++! Red Hat Defaults: ++*allowFontOps: false ++*allowTcapOps: false ++*VT100*eightBitInput: false ++*VT100*scrollBar: true ++*VT100*utf8Title: true diff --git a/xterm.spec b/xterm.spec index 1f148f7..5b277cf 100644 --- a/xterm.spec +++ b/xterm.spec @@ -1,27 +1,25 @@ -%bcond_with trace - Summary: Terminal emulator for the X Window System Name: xterm -Version: 411 -Release: %autorelease +Version: 331 +Release: 1%{?dist} URL: https://invisible-island.net/xterm -License: MIT AND X11 AND HPND AND CC-BY-4.0 -BuildRequires: make +License: MIT +Group: User Interface/X BuildRequires: gcc pkgconfig ncurses-devel libutempter-devel BuildRequires: libXft-devel libXaw-devel libXext-devel desktop-file-utils -BuildRequires: libxkbfile-devel pcre2-devel pkgconfig(libpcre2-posix) -BuildRequires: gnupg2 +BuildRequires: libxkbfile-devel xorg-x11-apps +Requires: xterm-resize = %{version}-%{release} Recommends: xorg-x11-fonts-misc -Source0: https://invisible-island.net/archives/xterm/%{name}-%{version}.tgz -Source1: https://invisible-island.net/archives/xterm/%{name}-%{version}.tgz.asc -Source2: https://invisible-island.net/public/dickey@invisible-island.net-rsa3072.asc -Source3: https://invisible-island.net/archives/xterm/16colors.txt +Source0: ftp://ftp.invisible-island.net/xterm/%{name}-%{version}.tgz +Source1: ftp://ftp.invisible-island.net/xterm/16colors.txt -Patch1: xterm-defaults.patch +Patch1: xterm-resources.patch Patch2: xterm-desktop.patch Patch3: xterm-man-paths.patch +%bcond_with trace + %global x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt) %description @@ -37,8 +35,11 @@ Prints a shell command for setting the appropriate environment variables to indicate the current size of the window from which the command is run. %prep -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%autosetup +%setup -q + +%patch1 -p1 -b .resources +%patch2 -p1 -b .desk +%patch3 -p1 -b .man-paths for f in THANKS; do iconv -f iso8859-1 -t utf8 -o ${f}{_,} && @@ -49,25 +50,25 @@ done %configure \ --enable-meta-sends-esc \ --disable-backarrow-key \ + --enable-256-color \ --enable-exec-xterm \ + --enable-luit \ %{?with_trace: --enable-trace} \ --enable-warnings \ + --enable-wide-chars \ --with-app-defaults=%{x11_app_defaults_dir} \ --with-icon-theme=hicolor \ --with-icondir=%{_datadir}/icons \ --with-utempter \ --with-tty-group=tty \ - --disable-full-tgetent \ - --with-pcre2 \ - --enable-readline-mouse \ - --enable-logging + --disable-full-tgetent -%make_build +make %{?_smp_mflags} %install -%make_install +make DESTDIR=$RPM_BUILD_ROOT install -cp -fp %{SOURCE3} 16colors.txt +cp -fp %{SOURCE1} 16colors.txt desktop-file-install \ %if 0%{?fedora} && 0%{?fedora} < 19 @@ -89,7 +90,7 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata %{_mandir}/man1/xterm.1* %{_datadir}/appdata/xterm.appdata.xml %{_datadir}/applications/*xterm.desktop -%{_datadir}/icons/hicolor/*/apps/*xterm* +%{_datadir}/icons/hicolor/*/apps/xterm* %{_datadir}/pixmaps/*xterm*.xpm %{x11_app_defaults_dir}/KOI8RXTerm* %{x11_app_defaults_dir}/UXTerm* @@ -100,4 +101,562 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata %{_mandir}/man1/resize.1* %changelog -%autochangelog +* Thu Mar 29 2018 Miroslav Lichvar 331-1 +- update to 331 +- add gcc to build requirements + +* Fri Feb 09 2018 Fedora Release Engineering - 330-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Jan 06 2018 Igor Gnatenko - 330-4 +- Remove obsolete scriptlets + +* Thu Aug 03 2017 Fedora Release Engineering - 330-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 330-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jun 21 2017 Miroslav Lichvar 330-1 +- update to 330 + +* Mon Jun 12 2017 Miroslav Lichvar 329-1 +- update to 329 + +* Thu Jun 01 2017 Miroslav Lichvar 328-1 +- update to 328 + +* Mon Feb 06 2017 Miroslav Lichvar 327-3 +- recommend xorg-x11-fonts-misc (#487499) + +* Wed Nov 16 2016 Jason L Tibbitts III 327-2 +- move resize tool to a subpackage (#1349582) + +* Mon Oct 10 2016 Miroslav Lichvar 327-1 +- update to 327 + +* Fri Oct 07 2016 Miroslav Lichvar 326-1 +- update to 326 +- buildrequire xorg-x11-apps to get correct path of luit + +* Wed Jun 08 2016 Miroslav Lichvar 325-1 +- update to 325 + +* Mon Mar 14 2016 Miroslav Lichvar 324-1 +- update to 324 + +* Tue Mar 08 2016 Miroslav Lichvar 323-1 +- update to 323 + +* Fri Feb 05 2016 Fedora Release Engineering - 322-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jan 08 2016 Miroslav Lichvar 322-1 +- update to 322 + +* Thu Sep 03 2015 Miroslav Lichvar 320-1 +- update to 320 + +* Mon Aug 24 2015 Miroslav Lichvar 319-1 +- update to 319 + +* Fri Jun 19 2015 Fedora Release Engineering - 318-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Apr 16 2015 Miroslav Lichvar 318-1 +- update to 318 + +* Fri Mar 13 2015 Miroslav Lichvar 316-1 +- update to 316 + +* Tue Mar 03 2015 Miroslav Lichvar 315-1 +- update to 315 + +* Mon Jan 05 2015 Miroslav Lichvar 314-1 +- update to 314 + +* Mon Dec 08 2014 Adam Jackson 313-2 +- Don't BuildRequire: imake, we're not actually using it to build. + +* Mon Dec 08 2014 Miroslav Lichvar 313-1 +- update to 313 + +* Mon Sep 29 2014 Miroslav Lichvar 312-1 +- update to 312 + +* Fri Sep 19 2014 Miroslav Lichvar 311-1 +- update to 311 + +* Mon Aug 18 2014 Fedora Release Engineering - 310-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jul 29 2014 Miroslav Lichvar 310-1 +- update to 310 + +* Thu Jul 17 2014 Miroslav Lichvar 309-1 +- update to 309 + +* Mon Jun 23 2014 Miroslav Lichvar 308-1 +- update to 308 + +* Mon Jun 09 2014 Miroslav Lichvar 306-1 +- update to 306 + +* Sun Jun 08 2014 Fedora Release Engineering - 305-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Jun 03 2014 Miroslav Lichvar 305-1 +- update to 305 + +* Wed May 07 2014 Miroslav Lichvar 304-1 +- update to 304 + +* Tue Mar 11 2014 Miroslav Lichvar 303-1 +- update to 303 + +* Wed Mar 05 2014 Miroslav Lichvar 302-1 +- update to 302 + +* Tue Jan 21 2014 Miroslav Lichvar 301-1 +- update to 301 + +* Tue Dec 10 2013 Miroslav Lichvar 300-1 +- update to 300 + +* Tue Dec 03 2013 Miroslav Lichvar 299-1 +- update to 299 + +* Thu Nov 28 2013 Miroslav Lichvar 298-1 +- update to 298 + +* Thu Sep 19 2013 Miroslav Lichvar 297-1 +- update to 297 + +* Sun Aug 04 2013 Fedora Release Engineering - 295-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 10 2013 Miroslav Lichvar 295-1 +- update to 295 + +* Wed May 29 2013 Miroslav Lichvar 293-1 +- update to 293 + +* Mon Apr 29 2013 Miroslav Lichvar 292-1 +- update to 292 + +* Thu Feb 28 2013 Miroslav Lichvar 291-1 +- update to 291 + +* Sun Feb 10 2013 Parag Nemade - 289-2 +- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 + +* Fri Feb 08 2013 Miroslav Lichvar 289-1 +- update to 289 + +* Thu Jan 10 2013 Miroslav Lichvar 288-1 +- update to 288 + +* Mon Nov 26 2012 Miroslav Lichvar 287-1 +- update to 287 + +* Tue Oct 30 2012 Miroslav Lichvar 286-1 +- update to 286 + +* Mon Oct 15 2012 Miroslav Lichvar 284-1 +- update to 284 + +* Wed Oct 10 2012 Miroslav Lichvar 283-1 +- update to 283 +- install icon to hicolor theme and use it in desktop file (#804279) +- use new configure options to set some resource defaults (#819588) +- fix URL (#856957) +- remove obsolete macros + +* Thu Oct 04 2012 Rex Dieter 278-4 +- revert bad -3 build + +* Tue Sep 25 2012 Rex Dieter 278-3 +- xterm.desktop: +Path=$HOME + +* Sun Jul 22 2012 Fedora Release Engineering - 278-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 26 2012 Miroslav Lichvar 278-1 +- update to 278 + +* Mon Jan 09 2012 Miroslav Lichvar 277-1 +- update to 277 + +* Tue Oct 11 2011 Miroslav Lichvar 276-1 +- update to 276 + +* Mon Sep 12 2011 Miroslav Lichvar 275-1 +- update to 275 + +* Tue Aug 30 2011 Miroslav Lichvar 273-1 +- update to 273 + +* Fri Jul 15 2011 Miroslav Lichvar 271-1 +- update to 271 + +* Wed Apr 27 2011 Miroslav Lichvar 270-1 +- update to 270 + +* Mon Feb 21 2011 Miroslav Lichvar 269-1 +- update to 269 + +* Mon Feb 14 2011 Miroslav Lichvar 268-1 +- update to 268 + +* Tue Feb 08 2011 Fedora Release Engineering - 267-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Nov 23 2010 Miroslav Lichvar 267-1 +- update to 267 + +* Fri Nov 05 2010 Miroslav Lichvar 266-1 +- update to 266 +- fix building with new libXaw + +* Mon Oct 18 2010 Miroslav Lichvar 264-1 +- update to 264 + +* Tue Sep 07 2010 Miroslav Lichvar 262-1 +- update to 262 + +* Fri Jul 02 2010 Miroslav Lichvar 261-2 +- remove NoDisplay=true from desktop file, use upstream version (#607018) + +* Tue Jun 29 2010 Miroslav Lichvar 261-1 +- update to 261 + +* Mon Jun 21 2010 Miroslav Lichvar 260-1 +- update to 260 + +* Thu Jun 10 2010 Miroslav Lichvar 259-1 +- update to 259 +- link with -lICE +- convert THANKS to UTF-8 + +* Wed May 05 2010 Miroslav Lichvar 258-1 +- update to 258 + +* Tue Mar 09 2010 Miroslav Lichvar 256-1 +- update to 256 +- enable XKB Bell support (#568748) + +* Tue Feb 02 2010 Miroslav Lichvar 255-1 +- update to 255 + +* Fri Dec 11 2009 Miroslav Lichvar 253-1 +- update to 253 + +* Tue Dec 08 2009 Miroslav Lichvar 252-1 +- update to 252 + +* Thu Nov 19 2009 Miroslav Lichvar 251-1 +- update to 251 + +* Tue Oct 20 2009 Miroslav Lichvar 250-1 +- update to 250 + +* Thu Oct 08 2009 Miroslav Lichvar 249-1 +- update to 249 + +* Tue Sep 29 2009 Miroslav Lichvar 248-2 +- fix various bugs when display is scrolled up (#524503) + +* Thu Sep 17 2009 Miroslav Lichvar 248-1 +- update to 248 + +* Tue Sep 01 2009 Miroslav Lichvar 247-1 +- update to 247 + +* Tue Aug 18 2009 Miroslav Lichvar 246-1 +- update to 246 + +* Thu Aug 13 2009 Miroslav Lichvar 245-1 +- update to 245 + +* Mon Jul 27 2009 Fedora Release Engineering - 242-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Mar 02 2009 Miroslav Lichvar 242-3 +- fix bell (#487829) + +* Thu Feb 26 2009 Fedora Release Engineering - 242-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 18 2009 Miroslav Lichvar 242-1 +- update to 242 +- use upstream default value for modifyFunctionKeys resource +- remove png suffix from icon name in desktop file + +* Tue Jan 06 2009 Miroslav Lichvar 238-1 +- update to 238 (#479000, CVE-2008-2383) +- set default values of allowWindowOps and allowFontOps resources to false + +* Tue Sep 16 2008 Miroslav Lichvar 237-1 +- update to 237 + +* Wed Jul 30 2008 Miroslav Lichvar 236-1 +- update to 236 +- enable support for spawn-new-terminal action (#457130) + +* Tue Apr 22 2008 Miroslav Lichvar 235-1 +- update to 235 + +* Mon Mar 03 2008 Miroslav Lichvar 234-1 +- update to 234 + +* Wed Feb 27 2008 Miroslav Lichvar 233-1 +- update to 233 + +* Thu Jan 31 2008 Miroslav Lichvar 232-1 +- update to 232 + +* Mon Jan 07 2008 Miroslav Lichvar 231-1 +- update to 231 +- remove setgid utempter from xterm binary (#229360) + +* Fri Jan 04 2008 Miroslav Lichvar 230-1 +- update to 230 + +* Wed Aug 22 2007 Miroslav Lichvar 229-2 +- rebuild + +* Mon Aug 13 2007 Miroslav Lichvar 229-1 +- update to 229 + +* Mon Jul 23 2007 Miroslav Lichvar 228-1 +- update to 228 + +* Fri Jun 29 2007 Miroslav Lichvar 227-1 +- update to 227 + +* Fri Jun 22 2007 Miroslav Lichvar 226-1 +- update to 226 + +* Thu Apr 12 2007 Miroslav Lichvar 225-2 +- fix sections in man pages + +* Tue Mar 27 2007 Miroslav Lichvar 225-1 +- update to 225 + +* Tue Mar 20 2007 Miroslav Lichvar 224-2 +- fix background color setting in alternate screen +- don't display xterm in menus (#231000) + +* Fri Feb 16 2007 Miroslav Lichvar 224-1 +- update to 224 +- drop utempter group before creating pty +- add Icon to desktop file (#227925) + +* Wed Feb 07 2007 Miroslav Lichvar 223-3 +- spec cleanup (#226660) + +* Thu Jan 18 2007 Miroslav Lichvar 223-2 +- make xterm binary sgid utempter (#222847) +- fix font size changes with -fa option (#222340) +- fix redrawing of internal border (#223027) +- enable metaSendsEscape resource and set modifyFunctionKeys to 0 by default + +* Thu Dec 07 2006 Miroslav Lichvar 223-1 +- update to 223 + +* Thu Nov 23 2006 Miroslav Lichvar 222-1 +- update to 222 +- link with libncurses instead of libtermcap +- spec cleanup + +* Mon Sep 04 2006 Miroslav Lichvar 215-3.fc6 +- fix segfault when /etc/termcap is missing (#201246) + +* Wed Jul 26 2006 Mike A. Harris 215-2.fc6 +- Replace BuildRequires utempter with libutempter-devel +- Change BuildRoot tag to comply with Fedora packaging guidelines +- Use pkg-config to autodetect the location of the system app-defaults dir +- Add BuildRequires: pkgconfig + +* Mon Jul 17 2006 Jason Vas Dias - 215-1.fc6 +- Upgrade to upstream version 215 + +* Wed Jul 12 2006 Jesse Keating - 213-2.1 +- rebuild + +* Tue Jul 11 2006 Adam Jackson - 213-2.fc6 +- Use correct dist tag in Release string. + +* Wed May 31 2006 Jason Vas Dias - 213-1 +- Upgrade to upstream version 213 (fixes bug 192627) +- fix bug 189161 : make -r/-rv do reverseVideo with or without + xterm*{fore,back}ground set + +* Thu Apr 13 2006 Jason Vas Dias - 212-1 +- Upgrade to upstream version 212 +- fix bug 188031 : paths in man-page + +* Wed Mar 29 2006 Jason Vas Dias - 211-4 +- fix bug 186935: cursor GCs must be freed with XtReleaseGC + +* Tue Mar 21 2006 Jason Vas Dias - 211-1 +- Upgrade to upstream version 211 (fixes bug 186094). +- Enable new 'utf8Title' resource by default + +* Tue Mar 07 2006 Jason Vas Dias - 209-4 +- fix bug 183993: call set_cursor_gcs in ReverseVideo + +* Wed Feb 22 2006 Jason Vas Dias - 209-2 +- fix bug 182382: check for (VWindow(screen)!=0) in set_cursor_gcs +- further fix for bug 178302: allow *vt100*cursorColor to be same as fg + +* Tue Feb 14 2006 Jason Vas Dias - 209-1 +- Upgrade to upstream version 209 (fixes bug 180450) + +* Fri Feb 10 2006 Jesse Keating - 208-1.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 208-1.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Tue Jan 17 2006 Jason Vas Dias - 208-1 +- Upgrade to upstream version 208 +- Allow root user to grab the console, even if /dev/console + not owned by root +- restore Red Hat '*VT100*scrollBar:1' default Xresource + +* Wed Dec 21 2005 Jason Vas Dias - 207-10 +- Fix bug 164210: tek4014 support should be enabled by default + +* Wed Dec 14 2005 Jason Vas Dias - 207-8 +- Fix bug 175684: compile with --enable-256-color +- Fix bug 155538 addenda - restore '*VT100*backarrowKey:0' + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Mon Nov 21 2005 Jason Vas Dias - 207-5 +- fix bug 173703: remove reference to /usr/X11R6/bin/luit : + PROJECTROOT should be /usr, not /usr/X11R6 + +* Fri Nov 18 2005 Jason Vas Dias - 207-4 +- fix bug 173541: better fix for freetype configuration problem + +* Mon Nov 14 2005 Jason Vas Dias - 207-1 +- Upgrade to upstream version 207 +- Fix app-defaults directory for modular X11 + +* Sun Nov 13 2005 Jeremy Katz - 206-4 +- rebuild for newer modular X + +* Fri Nov 04 2005 Jason Vas Dias 206-1 +- Upgrade to upstream version 206 + +* Wed Oct 12 2005 Jason Vas Dias 205-1 +- Upgrade to upstream version 205 + fixes bugs: 124421, 129146, 159562, 161894, 169347 + +* Sat Sep 24 2005 Mike A. Harris 200-10 +- Updated xterm-resources-redhat.patch to add "xterm*ttyModes: erase ^?" + resource to fix bug (#155538,160354,163812,162549) + +* Wed Sep 14 2005 Mike A. Harris 200-9 +- Updated xterm-resources-redhat.patch to remove utf8 resource which was + added in the 200-7 build, as it was incorrectly set to 'true' instead + of '1', and bug #138681 turned out to be a gdm bug instead of an xterm + bug. This fixes bug (#163568). + +* Mon Aug 29 2005 Mike A. Harris 200-8 +- Added --disable-tek4014 to ./configure flags, to disable tek support + for bug (#164210) + +* Mon May 2 2005 Mike A. Harris 200-7 +- Updated xterm-resources-redhat.patch to enable xterm utf8 resource by + default, as our default OS environment is UTF-8, for bug (#138681) + +* Sat Apr 16 2005 Mike A. Harris 200-6 +- Added option to spec file to allow easy rebuilding with 256 color option + for those who prefer this non-default behaviour (#103402) + +* Tue Mar 8 2005 Soeren Sandmann 200-5 +- Ported xterm-resources-redhat.patch to newer xterms. (#126855) + +* Sun Mar 6 2005 Mike A. Harris 200-4 +- Added libtermcap-devel and utempter to BuildRequires +- Changed BuildRequires from XFree86-devel to xorg-x11-devel + +* Sun Mar 6 2005 Mike A. Harris 200-3 +- Rebuild with gcc 4 for FC4 development + +* Mon Feb 7 2005 Mike A. Harris 200-2 +- Removed chmod from prep, and updated comment to refect (#128341c12) + +* Mon Feb 7 2005 Mike A. Harris 200-1 +- Updated main tarball to xterm-200 for FC4 devel +- Disabled xterm-179-ppc-fix-bug-101472.patch for now, to see if the problem + occurs on ppc still or not. + +* Tue Jul 13 2004 Mike A. Harris 192-1 +- Updated main tarball to xterm-192 for FC3 devel +- Resolved bugs #126569,127132 + +* Fri Jun 18 2004 Mike A. Harris 191-1 +- Updated main tarball to xterm-191 for FC3 devel +- Disabled xterm-resources-redhat.patch to see what if anything breaks, as + it no longer applies cleanly. Hopefully we can just ship stock xterm + resources now, although I realize that is more likely to be a pie in the + sky fantasy once the bug reports trickle in from this change. ;o) + +* Tue Jun 15 2004 Elliot Lee 179-8 +- rebuilt + +* Thu Jun 3 2004 Mike A. Harris 179-7 +- Rebuilt for FC3 devel + +* Fri Feb 13 2004 Elliot Lee 179-6.EL +- rebuilt + +* Mon Sep 8 2003 Mike A. Harris 179-5.EL +- Rebuilt 179-5 for Taroon + +* Mon Sep 8 2003 Mike A. Harris 179-5 +- Added xterm-179-ppc-fix-bug-101472.patch ifarch ppc ppc64 to fix bug (#101472) + +* Wed Aug 27 2003 Bill Nottingham 179-4.1 +- fix symlink +- rebuild + +* Wed Aug 13 2003 Mike A. Harris 179-3.EL +- Rebuilt for Taroon with symlink fixes. + +* Wed Aug 13 2003 Mike A. Harris 179-3 +- Added symlink /usr/X11R6/bin/xterm pointing to _bindir/xterm so that apps + and scripts which invoke xterm explicitly as /usr/X11R6/bin/xterm, will + continue to work correctly without surprises (#101994) + +* Wed Jun 04 2003 Elliot Lee 179-2.EL +- rebuilt + +* Fri May 30 2003 Mike A. Harris 179-1.EL +- Bump release to 1.EL for Red Hat Enterprise Linux build + +* Mon May 26 2003 Mike A. Harris 179-1 +- Updated to upstream xterm 179 +- [SECURITY] Added xterm-can-2003-0063.patch from XFree86 4.3.0-12 package +- Added Red Hat xterm-resources-redhat.patch from XFree86 4.3.0-12 package +- Added "chmod -R u+w *" after source is decompressed or else patches can not + be applied due to upstream source being read only files +- Built xterm 179-1 in rawhide + +* Mon May 5 2003 Mike A. Harris 177-2.0.EL +- Bump release to 2.0.EL for Red Hat Enterprise Linux build + +* Mon May 5 2003 Mike A. Harris 177-2 +- Build fix for lib64: _x11datadir == /usr/X11R6/lib +- Another lib64 build fix: xterm uses /usr/%%{_lib}/X11/app-defaults when it + should be using an arch-neutral dir {_x11datadir}/X11/app-defaults instead + +* Tue Apr 15 2003 Mike A. Harris 177-1 +- Call configure with "--enable-luit --enable-warnings --enable-wide-chars + --with-utempter" +- Initial build.