From f6d0acdb7d6b7f1e7769aff34ebf9a79775475de Mon Sep 17 00:00:00 2001 From: jvdias Date: Oct 13 2005 00:54:16 +0000 Subject: fix bugs 124421, 129146, 159562, 161894, 169347 --- diff --git a/.cvsignore b/.cvsignore index a3181d9..f624480 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,4 @@ xterm-192.tgz xterm-200.tgz +xterm-205.tgz +xterm-205.tgz.asc diff --git a/sources b/sources index c5bfaed..36aed3d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -c55b615195aebda12ea2422ea4bd718a xterm-200.tgz +5228ebbc1254f5b0a096d5b767c6fc88 xterm-205.tgz +9228dd69ebe79ca286ab060132148715 xterm-205.tgz.asc diff --git a/xterm.spec b/xterm.spec index 1281e40..d6f17c7 100644 --- a/xterm.spec +++ b/xterm.spec @@ -3,8 +3,8 @@ Summary: xterm terminal emulator for the X Window System Name: xterm -Version: 200 -Release: 10 +Version: 205 +Release: 1 URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -13,7 +13,7 @@ Source0: ftp://dickey.his.com/xterm/%{name}-%{version}.tgz Patch0: xterm-can-2003-0063.patch Patch1: xterm-resources-redhat.patch Patch2: xterm-179-ppc-fix-bug-101472.patch - +Patch3: xterm-tty-group-name.patch BuildRequires: xorg-x11-devel >= 6.7.0 BuildRequires: utempter libtermcap-devel @@ -28,10 +28,11 @@ programs that can't use the window system directly. # but appears to be fixed now #chmod -R u+w . %patch0 -p0 -b .can-2003-0063 -%patch1 -p0 -b .resources-redhat +%patch1 -p1 -b .resources-redhat %ifarch ppc ppc64 #%patch2 -p0 -b .ppc-fix-bug-101472 %endif +%patch3 -p1 -b .tty-group-name %build %configure --enable-luit \ @@ -39,7 +40,8 @@ programs that can't use the window system directly. --enable-wide-chars \ --with-utempter \ --disable-tek4014 \ - %{?_with_256_color:--enable-256-color} + %{?_with_256_color:--enable-256-color}; +export XTERM_TTY_GROUP_NAME=tty; make %install @@ -62,7 +64,7 @@ mv $RPM_BUILD_ROOT/usr/%{_lib}/X11/app-defaults/* $RPM_BUILD_ROOT/%{_x11datadir} } %clean -rm -rf $RPM_BUILD_ROOT +#rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) @@ -77,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT %{_x11bindir}/xterm %changelog +* 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)