From 5b64c607bbe6a6ec7d9f97a5651707f7a96d5ea69f0a64ffec8d8f0c0fc47f28 Mon Sep 17 00:00:00 2001
From: Maurizio Galli <maurizio.galli@suse.com>
Date: Wed, 13 Feb 2019 09:49:52 +0000
Subject: [PATCH] Accepting request 674152 from
 home:mauriziogalli:branches:X11:xfce

- Fix issue with xfce4-terminal-settings.desktop entries boo#1125146
- Dropped obsolete macros
- Added %license macro

OBS-URL: https://build.opensuse.org/request/show/674152
OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-terminal?expand=0&rev=38
---
 xfce4-terminal.changes |  7 +++++++
 xfce4-terminal.spec    | 12 +++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/xfce4-terminal.changes b/xfce4-terminal.changes
index fd8f37a..eb7fb4f 100644
--- a/xfce4-terminal.changes
+++ b/xfce4-terminal.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb 12 15:05:10 UTC 2019 - Maurizio Galli <maurizio.galli@gmail.com>
+
+- Fix issue with xfce4-terminal-settings.desktop entries boo#1125146
+- Dropped obsolete macros
+- Added %license macro
+
 -------------------------------------------------------------------
 Wed May 16 09:40:26 UTC 2018 - seife+obs@b1-systems.com
 
diff --git a/xfce4-terminal.spec b/xfce4-terminal.spec
index b8652a1..a6f9927 100644
--- a/xfce4-terminal.spec
+++ b/xfce4-terminal.spec
@@ -27,6 +27,7 @@ Url:            http://docs.xfce.org/apps/terminal/start
 Source0:        http://archive.xfce.org/src/apps/xfce4-terminal/0.8/%{name}-%{version}.tar.bz2
 BuildRequires:  intltool
 BuildRequires:  pkgconfig
+BuildRequires:  update-desktop-files
 BuildRequires:  utempter-devel
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(exo-1)
@@ -76,11 +77,17 @@ make %{?_smp_mflags} V=1
     done
 ) >> %{name}.lang
 
+
+# Fix name issue with xfce4-terminal-settings desktop file name entries boo#1125146
+desktop-file-edit %{buildroot}%{_datadir}/applications/%{name}-settings.desktop --set-name='Xfce Terminal Settings'
+desktop-file-edit %{buildroot}%{_datadir}/applications/%{name}-settings.desktop --set-comment='Terminal Emulator Settings'
+desktop-file-edit %{buildroot}%{_datadir}/applications/%{name}-settings.desktop --set-generic-name='Terminal Emulator Settings'
+
 %find_lang %{name} --with-man %{?no_lang_C}
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS COPYING HACKING NEWS README THANKS
+%doc AUTHORS HACKING NEWS README THANKS
+%license COPYING
 %{_bindir}/xfce4-terminal
 %dir %{_datadir}/xfce4
 %{_datadir}/xfce4/terminal
@@ -91,6 +98,5 @@ make %{?_smp_mflags} V=1
 %{_mandir}/man1/xfce4-terminal.1*
 
 %files lang -f %{name}.lang
-%defattr(-,root,root)
 
 %changelog