fix bugs 175684, 155538

xterm.spec

@@ -1,12 +1,15 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
 Version: 207
-Release: 7.1
+Release: 8
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
 BuildRoot: %{_tmppath}/%{name}-root
-Source0: ftp://dickey.his.com/xterm/%{name}-%{version}.tgz
+Source0: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
+Source1: ftp://invisible-island.net/xterm/ctlseqs.txt.gz
+Source2: ftp://invisible-island.net/xterm/UnicodeData-Latest.txt.gz
+Source3: ftp://invisible-island.net/xterm/16colors.txt
 Patch0: xterm-can-2003-0063.patch
 Patch1: xterm-resources-redhat.patch
 Patch2: xterm-179-ppc-fix-bug-101472.patch
@@ -32,6 +35,9 @@ BuildRequires: zlib-devel
 BuildRequires: libtermcap-devel
 BuildRequires: utempter
 
+%define x11_app_defaults_dir %{_datadir}/X11/app-defaults
+%{?!_with_256_color: %define _with_256_color 1}
+
 %description
 The xterm program is a terminal emulator for the X Window System. It
 provides DEC VT102 and Tektronix 4014 compatible terminals for
@@ -58,16 +64,23 @@ export CFLAGS="$RPM_OPT_FLAGS"
            --with-utempter \
            --disable-tek4014 \
 	   --enable-narrowproto \
-	   --with-app-defaults=%{_sysconfdir}/X11/app-defaults \
-           %{?_with_256_color:--enable-256-color};
+	   --enable-session-mgt \
+	   --with-app-defaults=%{x11_app_defaults_dir} \
+%if %{_with_256_color}
+	   --enable-256-color \
+%endif
+;
 export XTERM_TTY_GROUP_NAME=tty;
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall appsdir=$RPM_BUILD_ROOT/%{_sysconfdir}/X11/app-defaults
+%makeinstall appsdir=$RPM_BUILD_ROOT/%{x11_app_defaults_dir}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 mv $RPM_BUILD_ROOT/%{_mandir}/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
+gunzip < %SOURCE1 > ctlseqs.txt
+gunzip < %SOURCE2 > UnicodeData.txt
+cp -fp %SOURCE3 16colors.txt
 
 %clean
 #rm -rf $RPM_BUILD_ROOT
@@ -79,12 +92,16 @@ mv $RPM_BUILD_ROOT/%{_mandir}/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
 %{_bindir}/xterm
 %{_mandir}/man1/resize.1*
 %{_mandir}/man1/xterm.1*
-%{_sysconfdir}/X11/app-defaults/UXTerm
-%{_sysconfdir}/X11/app-defaults/XTerm
-%{_sysconfdir}/X11/app-defaults/XTerm-color
-%doc xterm.log.html ctlseqs.ms README.i18n
+%{x11_app_defaults_dir}/UXTerm
+%{x11_app_defaults_dir}/XTerm
+%{x11_app_defaults_dir}/XTerm-color
+%doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 
 %changelog
+* Wed Dec 14 2005 Jason Vas Dias<jvdias@redhat.com> - 207-8
+- Fix bug 175684: compile with --enable-256-color
+- Fix bug 155538 addenda - restore '*VT100*backarrowKey:0'
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt