From b89dc3b3159d4935275aca8d47cee9982f014208 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Fri, 2 Jul 2010 12:28:03 +0000
Subject: [PATCH] - remove NoDisplay=true from desktop file, use upstream
 version (#607018)

---
 xterm-261-desk.patch | 16 ++++++++++++++++
 xterm.desktop        | 10 ----------
 xterm.spec           | 10 +++++++---
 3 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 xterm-261-desk.patch
 delete mode 100644 xterm.desktop

diff --git a/xterm-261-desk.patch b/xterm-261-desk.patch
new file mode 100644
index 0000000..b648328
--- /dev/null
+++ b/xterm-261-desk.patch
@@ -0,0 +1,16 @@
+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;
diff --git a/xterm.desktop b/xterm.desktop
deleted file mode 100644
index dcda935..0000000
--- a/xterm.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=xterm Terminal
-GenericName=Terminal
-Comment=Terminal emulator for the X Window System
-Exec=xterm
-Icon=gnome-xterm
-Type=Application
-Categories=System;TerminalEmulator;
-NoDisplay=true
diff --git a/xterm.spec b/xterm.spec
index 59eab4e..dc5437a 100644
--- a/xterm.spec
+++ b/xterm.spec
@@ -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 system directly.
 %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@redhat.com> 261-2
+- remove NoDisplay=true from desktop file, use upstream version (#607018)
+
 * Tue Jun 29 2010 Miroslav Lichvar <mlichvar@redhat.com> 261-1
 - update to 261