rpms/xterm/devel xterm-261-desk.patch, NONE, 1.1 xterm.spec, 1.91, 1.92 xterm.desktop, 1.4, NONE

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3356

Modified Files:
	xterm.spec 
Added Files:
	xterm-261-desk.patch 
Removed Files:
	xterm.desktop 
Log Message:
- remove NoDisplay=true from desktop file, use upstream version (#607018)


xterm-261-desk.patch:
 xterm.desktop |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE xterm-261-desk.patch ---
diff -up xterm-261/xterm.desktop.desk xterm-261/xterm.desktop
--- xterm-261/xterm.desktop.desk	2010-06-15 12:58:13.000000000 +0200
+++ xterm-261/xterm.desktop	2010-07-02 13:02:56.000000000 +0200
@@ -32,10 +32,11 @@
 # -----------------------------------------------------------------------------
 [Desktop Entry]
 Name=XTerm
+GenericName=Terminal
 Comment=standard terminal emulator for the X window system
 Exec=xterm
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Icon=xterm-color_48x48
+Icon=gnome-xterm
 Categories=System;TerminalEmulator;


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- xterm.spec	29 Jun 2010 14:45:57 -0000	1.91
+++ xterm.spec	2 Jul 2010 12:28:03 -0000	1.92
@@ -1,7 +1,7 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
 Version: 261
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
 Group: User Interface/X
@@ -12,9 +12,9 @@ BuildRequires: libxkbfile-devel
 
 Source0: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
 Source1: ftp://invisible-island.net/xterm/16colors.txt
-Source2: %{name}.desktop
 
 Patch1: xterm-245-resources.patch
+Patch2: xterm-261-desk.patch
 Patch3: xterm-256-man-page_paths.patch
 
 %bcond_with trace
@@ -30,6 +30,7 @@ programs that can't use the window syste
 %setup -q
 
 %patch1 -p1 -b .resources
+%patch2 -p1 -b .desk
 %patch3 -p1 -b .man-page_paths
 
 for f in THANKS; do
@@ -60,7 +61,7 @@ cp -fp %{SOURCE1} 16colors.txt
 
 desktop-file-install --vendor=fedora \
 	--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-	%{SOURCE2}
+	xterm.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{x11_app_defaults_dir}/XTerm*
 
 %changelog
+* Fri Jul 02 2010 Miroslav Lichvar <mlichvar at redhat.com> 261-2
+- remove NoDisplay=true from desktop file, use upstream version (#607018)
+
 * Tue Jun 29 2010 Miroslav Lichvar <mlichvar at redhat.com> 261-1
 - update to 261
 


--- xterm.desktop DELETED ---