From e996be2970d374cf2bbf889e22458826f70b4975 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Jan 07 2008 11:35:57 +0000
Subject: - update to 231

- remove setgid utempter from xterm binary (#229360)

---

diff --git a/.cvsignore b/.cvsignore
index e8eecde..a00d773 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-230.tgz
+xterm-231.tgz
diff --git a/sources b/sources
index 6a8f135..fd74888 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-c1a654a6793aff285b69c1d1ed4f2c38  xterm-230.tgz
+b767d702e1464e16802b90c2187252c6  xterm-231.tgz
diff --git a/xterm.spec b/xterm.spec
index 1b5e256..1ef7497 100644
--- a/xterm.spec
+++ b/xterm.spec
@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 230
+Version: 231
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -17,7 +17,7 @@ Patch1: xterm-223-resources.patch
 Patch2: xterm-222-can-2003-0063.patch
 Patch3: xterm-226-man-page_paths.patch
 
-%{?!enable_trace:  %define enable_trace 0}
+%bcond_with trace
 
 %define x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt)
 
@@ -37,7 +37,7 @@ programs that can't use the window system directly.
 %configure \
 	--enable-256-color \
 	--enable-luit \
-%if %{enable_trace}
+%if %{with trace}
 	--enable-trace \
 %endif
 	--enable-warnings \
@@ -45,7 +45,6 @@ programs that can't use the window system directly.
 	--with-app-defaults=%{x11_app_defaults_dir} \
 	--with-utempter \
 	--with-tty-group=tty \
-	--disable-setgid \
 	--disable-full-tgetent
 
 make %{?_smp_mflags}
@@ -66,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc xterm.log.html ctlseqs.txt 16colors.txt README.i18n
-%attr(2755,root,utempter) %{_bindir}/xterm
+%{_bindir}/xterm
 %{_bindir}/koi8rxterm
 %{_bindir}/resize
 %{_bindir}/uxterm
@@ -76,11 +75,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xterm.1*
 %{_datadir}/applications/fedora-xterm.desktop
 %{_datadir}/pixmaps/xterm*.xpm
+%{x11_app_defaults_dir}/KOI8RXTerm
 %{x11_app_defaults_dir}/UXTerm
 %{x11_app_defaults_dir}/XTerm
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Mon Jan 07 2008 Miroslav Lichvar <mlichvar@redhat.com> 231-1
+- update to 231
+- remove setgid utempter from xterm binary (#229360)
+
 * Fri Jan 04 2008 Miroslav Lichvar <mlichvar@redhat.com> 230-1
 - update to 230