From 00187fad1bce3bc8801fbf7aea7c511eb7ce0a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
Date: Tue, 24 Apr 2018 15:26:38 +0200
Subject: [PATCH] Fix the icon installation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Petr Šabata <contyk@redhat.com>
---
 zathura-0.3.9-Fix-icon-install-path.patch | 25 +++++++++++++++++++++++
 zathura.spec                              | 13 ++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 zathura-0.3.9-Fix-icon-install-path.patch

diff --git a/zathura-0.3.9-Fix-icon-install-path.patch b/zathura-0.3.9-Fix-icon-install-path.patch
new file mode 100644
index 0000000..1152110
--- /dev/null
+++ b/zathura-0.3.9-Fix-icon-install-path.patch
@@ -0,0 +1,25 @@
+From d1c326319df638d2ad8681aa364e25dbf7ad4a58 Mon Sep 17 00:00:00 2001
+From: Sebastian Ramacher <sebastian@ramacher.at>
+Date: Tue, 24 Apr 2018 15:13:51 +0200
+Subject: [PATCH] Fix icon install path
+
+---
+ data/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index d56e693..a1d2cff 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -7,7 +7,7 @@ zathura_resources = gnome.compile_resources(
+ )
+ 
+ install_data('org.pwmt.zathura.xml', install_dir: dbusinterfacesdir)
+-install_data('org.pwmt.zathura.png', install_dir: join_paths(datadir, 'icons', 'hicolor', '128x128'))
++install_data('org.pwmt.zathura.png', install_dir: join_paths(datadir, 'icons', 'hicolor', '128x128', 'apps'))
+ 
+ i18n = import('i18n')
+ podir = join_paths(meson.source_root(), 'po')
+--
+libgit2 0.26.0
+
diff --git a/zathura.spec b/zathura.spec
index 4d931b4..fcefd53 100644
--- a/zathura.spec
+++ b/zathura.spec
@@ -1,13 +1,16 @@
 Name:              zathura
 Version:           0.3.9
-Release:           1%{?dist}
+Release:           2%{?dist}
 Summary:           A lightweight document viewer
 Group:             Applications/Publishing
 License:           zlib
 URL:               http://pwmt.org/projects/%{name}/
 Source0:           http://pwmt.org/projects/%{name}/download/%{name}-%{version}.tar.xz
+# https://git.pwmt.org/pwmt/zathura/commit/d1c326319df638d2ad8681aa364e25dbf7ad4a58
+Patch0:            %{name}-0.3.9-Fix-icon-install-path.patch
 BuildRequires:     binutils
 BuildRequires:     check
+BuildRequires:     desktop-file-utils
 BuildRequires:     file-devel
 BuildRequires:     gcc
 BuildRequires:     gettext
@@ -65,6 +68,7 @@ This package installs all available Zathura plugins.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %meson
@@ -73,6 +77,7 @@ This package installs all available Zathura plugins.
 %install
 %meson_install
 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %find_lang zathura
 
 %files -f zathura.lang
@@ -82,7 +87,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
 %{_mandir}/man*/*
 %{_datadir}/applications/*
 %{_datadir}/dbus-1/interfaces/org.pwmt.zathura.xml
-%{_datadir}/icons/hicolor/128x128/org.pwmt.zathura.png
+%{_datadir}/icons/hicolor/128x128/apps/org.pwmt.zathura.png
 %{_datadir}/metainfo/org.pwmt.zathura.appdata.xml
 
 %files devel
@@ -92,6 +97,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
 %files plugins-all
 
 %changelog
+* Tue Apr 24 2018 Petr Šabata <contyk@redhat.com> - 0.3.9-2
+- Validate the desktop file
+- Install the icon into the correct location
+
 * Mon Apr 09 2018 Petr Šabata <contyk@redhat.com> - 0.3.9-1
 - 0.3.9 bump