rpms/xterm/devel xterm-tty-group-name.patch, NONE, 1.1 xterm.spec, 1.16, 1.17

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25626

Modified Files:
	xterm.spec 
Added Files:
	xterm-tty-group-name.patch 
Log Message:
fix bugs 124421, 129146, 159562, 161894, 169347

xterm-tty-group-name.patch:
 configure |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE xterm-tty-group-name.patch ---
--- xterm-205/configure.tty_group_name	2005-09-18 19:19:09.000000000 -0400
+++ xterm-205/configure	2005-10-12 19:58:05.498170000 -0400
@@ -5175,6 +5175,10 @@
 # But we'll guess based on how our connection is set up - assuming it is done
 # properly.
 
+# Red Hat Bug 159562 - we cannot assume so - when xterm is built with
+# automated build environement, there is no terminal (stdin -> /dev/null) -
+# so for Red Hat builds, we define the tty group as a variable in the .spec file:
+if [ -z "$XTERM_TTY_GROUP_NAME" ]; then
 cf_uid=`id | sed -e 's/^^=*=//' -e 's/(.*$//'`
 if test "$cf_uid" != 0 ; then
 cf_cv_tty_group_name=
@@ -5198,6 +5202,9 @@
 	cf_cv_tty_group_name=$cf_grp
 fi
 fi
+else
+    cf_cv_tty_group_name="tty";
+fi;
 
 # If we cannot deduce the tty group, fall back on hardcoded cases
 


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xterm.spec	26 Sep 2005 18:45:35 -0000	1.16
+++ xterm.spec	13 Oct 2005 00:52:38 -0000	1.17
@@ -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 @@
 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 @@
 # 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 @@
            --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 @@
 }
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+#rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -77,6 +79,10 @@
 %{_x11bindir}/xterm
 
 %changelog
+* Wed Oct 12 2005 Jason Vas Dias <jvdias at redhat.com> 205-1
+- Upgrade to upstream version 205 
+  fixes bugs: 124421, 129146, 159562, 161894, 169347
+ 
 * Sat Sep 24 2005 Mike A. Harris <mharris at redhat.com> 200-10
 - Updated xterm-resources-redhat.patch to add "xterm*ttyModes: erase ^?"
   resource to fix bug (#155538,160354,163812,162549)