From 71d48f1432d49a12f3e1e4402f7397f3568b7ecc Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Mon, 17 Aug 2020 20:56:40 +0100
Subject: [PATCH] Update to 0.4.6

---
 .gitignore                    |  1 +
 0001-Set-application-ID.patch | 26 --------------------------
 sources                       |  2 +-
 zathura.spec                  | 22 +++++++++++++++-------
 4 files changed, 17 insertions(+), 34 deletions(-)
 delete mode 100644 0001-Set-application-ID.patch

diff --git a/.gitignore b/.gitignore
index 8e7006f..00d6ddb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ zathura-0.0.8.1.tar.gz
 /zathura-0.4.1.tar.xz
 /zathura-0.4.3.tar.xz
 /zathura-0.4.5.tar.xz
+/zathura-0.4.6.tar.xz
diff --git a/0001-Set-application-ID.patch b/0001-Set-application-ID.patch
deleted file mode 100644
index 96f7f11..0000000
--- a/0001-Set-application-ID.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 73228688090414d5ba2373f08167b547a7ea71c8 Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
-Date: Mon, 5 Aug 2019 19:14:14 +0100
-Subject: [PATCH] Set application ID
-
----
- zathura/zathura.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/zathura/zathura.c b/zathura/zathura.c
-index 1dbc5c4..71ed41e 100644
---- a/zathura/zathura.c
-+++ b/zathura/zathura.c
-@@ -420,6 +420,9 @@ zathura_init(zathura_t* zathura)
-     return false;
-   }
- 
-+  /* Set application ID */
-+  g_set_prgname("org.pwmt.zathura");
-+
-   /* create zathura (config/data) directory */
-   create_directories(zathura);
- 
--- 
-2.21.0
-
diff --git a/sources b/sources
index c24c283..3b74597 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zathura-0.4.5.tar.xz) = 9b846146bc8c391a5f8f0fbf0c7333281228a1e4a9b162fe420b54f566549a96b83d0345954c711fb80e21f97133d9fe644b641971db6d9bbbd1fe74544dd19c
+SHA512 (zathura-0.4.6.tar.xz) = 6cc2c4561fc77ab10d57456ea9f7193e7967bde53663a2197a12a449a5e177da49e8a5baf39a45133e24d136aaf9edaf5142e3737af5289e7f31e7d794d72668
diff --git a/zathura.spec b/zathura.spec
index ecbe36c..eb2f683 100644
--- a/zathura.spec
+++ b/zathura.spec
@@ -1,6 +1,6 @@
 Name:              zathura
-Version:           0.4.5
-Release:           2%{?dist}
+Version:           0.4.6
+Release:           1%{?dist}
 Summary:           A lightweight document viewer
 License:           zlib
 URL:               http://pwmt.org/projects/%{name}/
@@ -14,7 +14,6 @@ BuildRequires:     fish
 BuildRequires:     gcc
 BuildRequires:     gettext
 BuildRequires:     girara-devel >= 0.3.3
-BuildRequires:     git-core
 BuildRequires:     glib2-devel >= 2.50
 BuildRequires:     gtk3-devel >= 3.22
 BuildRequires:     intltool
@@ -102,7 +101,7 @@ Requires:          zathura = %{version}-%{release}
 This package provides %{summary}.
 
 %prep
-%autosetup -S git
+%autosetup
 
 %build
 %meson -Dsynctex=enabled -Dsqlite=enabled -Dmagic=enabled -Dseccomp=enabled -Dtests=enabled
@@ -110,19 +109,25 @@ This package provides %{summary}.
 
 %install
 %meson_install
+
+# Move fish completion file to correct location
+# https://bugzilla.redhat.com/show_bug.cgi?id=1869376
+install -m 0644 -p -D -t %{buildroot}/%{_datadir}/fish/completions/ %{buildroot}/%{_prefix}/local/share/fish/vendor_completions.d/%{name}.fish
+rm -f %{buildroot}/%{_prefix}/local/share/fish/vendor_completions.d/%{name}.fish
+
 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
 desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %find_lang zathura
 
 %files -f zathura.lang
 %license LICENSE
-%doc README
+%doc README.md
 %{_bindir}/*
 %{_mandir}/man*/*
 %{_datadir}/applications/*
 %{_datadir}/dbus-1/interfaces/org.pwmt.zathura.xml
 %{_datadir}/icons/hicolor/*/apps/org.pwmt.zathura.png
-%{_datadir}/icons/scalable/apps/org.pwmt.zathura.svg
+%{_datadir}/icons/hicolor/*/apps/org.pwmt.zathura.svg
 %{_datadir}/metainfo/org.pwmt.zathura.appdata.xml
 
 %files devel
@@ -141,6 +146,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/zsh/site-functions/_zathura
 
 %changelog
+* Mon Aug 17 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.4.6-1
+- Update to new upstream release
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
@@ -256,7 +264,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 * Wed Mar 05 2014 François Cami <fcami@fedoraproject.org> - 0.2.7-1
 - Update to 0.2.7.
 
-* Sat Dec 28 2013 François Cami <fcami@fedoraproject.org> - 0.2.6-1 
+* Sat Dec 28 2013 François Cami <fcami@fedoraproject.org> - 0.2.6-1
 - Update to latest upstream.
 
 * Sat Aug 31 2013 François Cami <fcami@fedoraproject.org> - 0.2.4-1