rpms/xterm/devel xterm-242-resources.patch, NONE, 1.1 .cvsignore, 1.32, 1.33 sources, 1.32, 1.33 xterm.desktop, 1.3, 1.4 xterm.spec, 1.70, 1.71 xterm-223-resources.patch, 1.1, NONE xterm-238-windowfontops.patch, 1.1, NONE

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16409

Modified Files:
	.cvsignore sources xterm.desktop xterm.spec 
Added Files:
	xterm-242-resources.patch 
Removed Files:
	xterm-223-resources.patch xterm-238-windowfontops.patch 
Log Message:
- update to 242
- use upstream default value for modifyFunctionKeys resource
- remove png suffix from icon name in desktop file


xterm-242-resources.patch:

--- NEW FILE xterm-242-resources.patch ---
diff -up xterm-242/XTerm.ad.resources xterm-242/XTerm.ad
--- xterm-242/XTerm.ad.resources	2009-02-13 01:14:13.000000000 +0100
+++ xterm-242/XTerm.ad	2009-02-18 15:00:23.000000000 +0100
@@ -210,3 +210,12 @@
 !*allowTcapOps: false
 !*allowTitleOps: false
 !*allowWindowOps: false
+
+! Red Hat Defaults:
+*allowFontOps: false
+*allowWindowOps: false
+*VT100*eightBitInput: false
+*VT100*metaSendsEscape: true
+*VT100*backarrowKey: false
+*VT100*scrollBar: true
+*VT100*utf8Title: true


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	6 Jan 2009 14:17:46 -0000	1.32
+++ .cvsignore	18 Feb 2009 14:47:26 -0000	1.33
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-238.tgz
+xterm-242.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	6 Jan 2009 14:17:46 -0000	1.32
+++ sources	18 Feb 2009 14:47:26 -0000	1.33
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-754f670723eb9a20f9f90d7c5f4a5bad  xterm-238.tgz
+663fa3aac8e30e4c2d4bf07c0aee4dca  xterm-242.tgz


Index: xterm.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xterm.desktop	20 Mar 2007 14:59:40 -0000	1.3
+++ xterm.desktop	18 Feb 2009 14:47:26 -0000	1.4
@@ -4,7 +4,7 @@
 GenericName=Terminal
 Comment=Terminal emulator for the X Window System
 Exec=xterm
-Icon=gnome-xterm.png
+Icon=gnome-xterm
 Type=Application
 Categories=System;TerminalEmulator;
 NoDisplay=true


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- xterm.spec	6 Jan 2009 14:17:46 -0000	1.70
+++ xterm.spec	18 Feb 2009 14:47:26 -0000	1.71
@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 238
+Version: 242
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -13,10 +13,9 @@
 Source1: ftp://invisible-island.net/xterm/16colors.txt
 Source2: %{name}.desktop
 
-Patch1: xterm-223-resources.patch
+Patch1: xterm-242-resources.patch
 Patch2: xterm-222-can-2003-0063.patch
 Patch3: xterm-226-man-page_paths.patch
-Patch4: xterm-238-windowfontops.patch
 
 %bcond_with trace
 
@@ -30,10 +29,9 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .redhat-resources
+%patch1 -p1 -b .resources
 %patch2 -p1 -b .can-2003-0063
 %patch3 -p1 -b .man-page_paths
-%patch4 -p1 -b .windowfontops
 
 %build
 %configure \
@@ -84,6 +82,11 @@
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Wed Feb 18 2009 Miroslav Lichvar <mlichvar at redhat.com> 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 <mlichvar at redhat.com> 238-1
 - update to 238 (#479000, CVE-2008-2383)
 - set default values of allowWindowOps and allowFontOps resources to false


--- xterm-223-resources.patch DELETED ---


--- xterm-238-windowfontops.patch DELETED ---