From 3cbe9d07d0f11ea95b92dfa0e25bd6ca6311a429960958603b9a58f057f97b59 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Thu, 14 Feb 2019 09:26:18 +0000
Subject: [PATCH] Accepting request 674653 from
 home:mauriziogalli:branches:editors

- Dropped .desktop files to follow openSUSE guidelines regarding console
  applications: https://lists.opensuse.org/opensuse-factory/2019-02/msg00377.html
- Dropped obsolete patch joe-4.6-desktop_files.patch

OBS-URL: https://build.opensuse.org/request/show/674653
OBS-URL: https://build.opensuse.org/package/show/editors/joe?expand=0&rev=34
---
 joe-4.6-desktop_files.patch | 40 -------------------------------------
 joe.changes                 |  7 +++++++
 joe.spec                    |  7 ++++---
 3 files changed, 11 insertions(+), 43 deletions(-)
 delete mode 100644 joe-4.6-desktop_files.patch

diff --git a/joe-4.6-desktop_files.patch b/joe-4.6-desktop_files.patch
deleted file mode 100644
index c81aa80..0000000
--- a/joe-4.6-desktop_files.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: joe-4.6/desktop/jmacs.desktop
-===================================================================
---- joe-4.6.orig/desktop/jmacs.desktop
-+++ joe-4.6/desktop/jmacs.desktop
-@@ -9,4 +9,4 @@ TryExec=jmacs
- Icon=accessories-text-editor
- Type=Application
- Terminal=true
--Categories=Utility;Development;TextEditor;
-+Categories=Utility;TextEditor;
-Index: joe-4.6/desktop/joe.desktop
-===================================================================
---- joe-4.6.orig/desktop/joe.desktop
-+++ joe-4.6/desktop/joe.desktop
-@@ -9,4 +9,4 @@ TryExec=joe
- Icon=accessories-text-editor
- Type=Application
- Terminal=true
--Categories=Utility;Development;TextEditor;
-+Categories=Utility;TextEditor;
-Index: joe-4.6/desktop/jpico.desktop
-===================================================================
---- joe-4.6.orig/desktop/jpico.desktop
-+++ joe-4.6/desktop/jpico.desktop
-@@ -9,4 +9,4 @@ TryExec=jpico
- Icon=accessories-text-editor
- Type=Application
- Terminal=true
--Categories=Utility;Development;TextEditor;
-+Categories=Utility;TextEditor;
-Index: joe-4.6/desktop/jstar.desktop
-===================================================================
---- joe-4.6.orig/desktop/jstar.desktop
-+++ joe-4.6/desktop/jstar.desktop
-@@ -9,4 +9,4 @@ TryExec=jstar
- Icon=accessories-text-editor
- Type=Application
- Terminal=true
--Categories=Utility;Development;TextEditor;
-+Categories=Utility;TextEditor;
diff --git a/joe.changes b/joe.changes
index cc8fd46..07444c1 100644
--- a/joe.changes
+++ b/joe.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Feb 13 15:58:00 UTC 2019 - Maurizio Galli <maurizio.galli@gmail.com>
+
+- Dropped .desktop files to follow openSUSE guidelines regarding console
+  applications: https://lists.opensuse.org/opensuse-factory/2019-02/msg00377.html
+- Dropped obsolete patch joe-4.6-desktop_files.patch
+  
 -------------------------------------------------------------------
 Thu Jan  3 12:39:35 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
 
diff --git a/joe.spec b/joe.spec
index 446c905..6195ce0 100644
--- a/joe.spec
+++ b/joe.spec
@@ -31,7 +31,6 @@ Patch3:         joe-3.3-warnings.patch
 Patch7:         joe-3.7-additional_key_mappings.patch
 Patch8:         joe-3.7-spec_association.patch
 Patch10:        joe-sigiot.patch
-Patch11:        joe-4.6-desktop_files.patch
 Patch12:        joe-4.6-nonvoid-functions.patch
 BuildRequires:  automake
 BuildRequires:  libselinux-devel
@@ -48,7 +47,6 @@ WordStar keybindings used in Borland's development environment.
 %patch7
 %patch8
 %patch10
-%patch11 -p1
 %patch12 -p1
 
 %build
@@ -65,6 +63,10 @@ for i in jmacs jpico jstar rjoe; do
 done
 rm -rf %{buildroot}/%{_datadir}/%{name}/lang
 
+# Remove desktop entries to follow openSUSE guidelines for console applications
+# See: https://lists.opensuse.org/opensuse-factory/2019-02/msg00377.html
+rm -rf %{buildroot}%{_datadir}/applications/*.desktop
+
 %files
 %doc %{_defaultdocdir}/%{name}
 %{_mandir}/man1/*
@@ -78,7 +80,6 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/lang
 %{_datadir}/%{name}/charmaps
 %dir %{_datadir}/%{name}/syntax
 %config(noreplace) %{_datadir}/%{name}/syntax/*
-%{_datadir}/applications/*.desktop
 %{_datadir}/joe/colors
 %{_datadir}/joe/colors/*.jcf