From 3349b7e22894e20592dd0b4fe4b6237e673faf6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
Date: Tue, 10 Apr 2018 22:44:06 +0200
Subject: [PATCH] 0.1.8 bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Petr Šabata <contyk@redhat.com>
---
 .gitignore      |  1 +
 sources         |  2 +-
 zathura-cb.spec | 54 +++++++++++++++++++++----------------------------
 3 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3905241..4fdc56c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /zathura-cb-0.1.4.tar.gz
 /zathura-cb-0.1.5.tar.gz
 /zathura-cb-0.1.6.tar.gz
+/zathura-cb-0.1.8.tar.xz
diff --git a/sources b/sources
index e26e3ed..8fb436e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zathura-cb-0.1.6.tar.gz) = 986293957b6bc5e5fe7033bb7c91e857b1089fe1a041eb39e516b4e906c2619d22d7ebfa0bfaba982cc6145cba4c6a2af01be810c6da71f4c862fb42bc91f230
+SHA512 (zathura-cb-0.1.8.tar.xz) = ca9b57e59f3955afabb246b8f71989647ce4c86f7f59aa13e4d7150f22dfb1bd64642efc155bba5997633d8bf5144e7ef42bea05512a2c2d20e13fb180c89cb8
diff --git a/zathura-cb.spec b/zathura-cb.spec
index 9434967..4d9dbbc 100644
--- a/zathura-cb.spec
+++ b/zathura-cb.spec
@@ -1,58 +1,50 @@
 Name:             zathura-cb
-Version:          0.1.6
-Release:          5%{?dist}
+Version:          0.1.8
+Release:          1%{?dist}
 Summary:          Comic book support for zathura
 Group:            Applications/Publishing
 License:          zlib
 URL:              http://pwmt.org/projects/zathura/plugins/%{name}
-Source0:          http://pwmt.org/projects/zathura/plugins/download/%{name}-%{version}.tar.gz
+Source0:          http://pwmt.org/projects/zathura/plugins/download/%{name}-%{version}.tar.xz
 BuildRequires:    binutils
-BuildRequires:    coreutils
+BuildRequires:    cairo-devel
+# Needed to validate the desktop file
 BuildRequires:    desktop-file-utils
 BuildRequires:    gcc
-BuildRequires:    make
-BuildRequires:    pkgconfig
-BuildRequires:    sed
-BuildRequires:    pkgconfig(cairo)
-BuildRequires:    pkgconfig(gdk-3.0)
-BuildRequires:    pkgconfig(gdk-pixbuf-2.0)
-BuildRequires:    pkgconfig(gio-2.0)
-BuildRequires:    pkgconfig(girara-gtk3)
-BuildRequires:    pkgconfig(glib-2.0)
-BuildRequires:    pkgconfig(libarchive)
-BuildRequires:    pkgconfig(zathura)
-Requires:         zathura
-Requires(post):   desktop-file-utils
-Requires(postun): desktop-file-utils
+BuildRequires:    girara-devel
+# Needed to validate appdata
+BuildRequires:    libappstream-glib
+BuildRequires:    libarchive
+BuildRequires:    meson >= 0.43
+BuildRequires:    zathura-devel >= 0.3.8
+Requires:         zathura >= 0.3.8
 
 %description
 The zathura-cb plugin adds comic book archive support to zathura.
 
 %prep
 %setup -q
-sed -i s/^install\:.*/install\:/g Makefile
 
 %build
-CFLAGS='%{optflags}' make %{?_smp_mflags} LIBDIR=%{_libdir} debug
-mv cb-debug.so cb.so
+%meson
+%meson_build
 
 %install
-make DESTDIR=%{buildroot} LIBDIR=%{_libdir} install
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
-
-%post
-update-desktop-database &> /dev/null || :
-
-%postun
-update-desktop-database &> /dev/null || :
+%meson_install
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainfo.xml
 
 %files
 %license LICENSE
 %doc AUTHORS
-%{_libdir}/zathura/cb.so
-%{_datadir}/applications/%{name}.desktop
+%{_libdir}/zathura/libcb.so
+%{_datadir}/applications/org.pwmt.zathura-cb.desktop
+%{_datadir}/metainfo/org.pwmt.zathura-cb.metainfo.xml
 
 %changelog
+* Tue Apr 10 2018 Petr Šabata <contyk@redhat.com> - 0.1.8-1
+- 0.1.8 bump
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild