From 75f9337176887747a45780cc8ab95241fb45f807 Mon Sep 17 00:00:00 2001
From: Artem Polishchuk <ego.cordatus@gmail.com>
Date: May 24 2020 02:00:21 +0000
Subject: Bundle libhandy-1


---

diff --git a/.gitignore b/.gitignore
index 151f14e..c36c826 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /Komikku-v0.14.0.tar.gz
 /Komikku-v0.15.0.tar.gz
 /Komikku-v0.16.0.tar.gz
+/libhandy-v0.80.0.tar.gz
diff --git a/komikku.spec b/komikku.spec
index c4b3f78..a56585f 100644
--- a/komikku.spec
+++ b/komikku.spec
@@ -9,7 +9,10 @@ Summary:        Online/offline manga reader for GNOME
 License:        GPLv3+
 URL:            https://gitlab.com/valos/Komikku
 Source0:        %{url}/-/archive/v%{version}/%{appname}-v%{version}.tar.gz
-BuildArch:      noarch
+Source1:        https://gitlab.gnome.org/GNOME/libhandy/-/archive/v0.80.0/libhandy-v0.80.0.tar.gz
+
+# Build arched temporary until libhandy-1 landed in Fedora
+#BuildArch:      noarch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool
@@ -20,12 +23,21 @@ BuildRequires:  python3-devel >= 3.6
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.24.1
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1803912
+#BuildRequires:  pkgconfig(libhandy-1)
+
+# For bundled libhandy-1
+BuildRequires:  pkgconfig(gladeui-2.0)
+BuildRequires:  vala
+
 Requires:       hicolor-icon-theme
 Requires:       python3-beautifulsoup4
 Requires:       python3-cloudscraper
 Requires:       python3-dateparser
 Requires:       python3-lxml
 
+Provides:       bundled(libhandy) = 0.80
+
 # # This could help to build Komikku for current Fedora releases at least in Copr
 # # * https://bugzilla.redhat.com/show_bug.cgi?id=1790100#c9
 # Patch0 provides compatibility with the other magic package, solving a conflict
@@ -47,17 +59,33 @@ with the Librem 5 phone.
 
 %prep
 %autosetup -n %{appname}-v%{version} -p1
+%autosetup -n %{appname}-v%{version} -D -T -a1
 
 
 %build
-%meson
+# Build libhandy-1
+pushd libhandy-v0.80.0
+%meson \
+    -Dexamples=false \
+    -Dglade_catalog=disabled \
+    -Dgtk_doc=false \
+    -Dintrospection=enabled \
+    -Dvapi=false \
 %meson_build
+%meson_install
+popd
 
-
-%install
+export PKG_CONFIG_PATH=%{buildroot}/usr/lib64/pkgconfig
+%meson
+%meson_build
 %meson_install
 %find_lang %{name}
 
+# Cleanup
+rm -rf %{buildroot}%{_includedir}/libhandy-1 \
+    %{buildroot}%{_libdir}/pkgconfig/ \
+    %{buildroot}/%{_datadir}/gir-1.0/
+
 
 %check
 appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.xml
@@ -76,10 +104,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_metainfodir}/*.xml
 %{python3_sitelib}/%{name}/
 
+# Bundled libhandy-1
+%{_libdir}/girepository-1.0/Handy-1.typelib
+%{_libdir}/libhandy-1.so*
+
 
 %changelog
 * Sun May 24 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 0.16.0-1
 - Update to 0.16.0
+- Bundle libhandy-1
 
 * Fri Apr 24 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 0.15.0-1
 - Update to 0.15.0
diff --git a/sources b/sources
index 83b863e..f302f49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Komikku-v0.16.0.tar.gz) = 98a2fc9227b91aec5fcc1a4e036116471bb8ee26949ff953f04704b481b4ccfc84769dee6746b16a048fdb4633dcf2a8158ed5273bc934126c437d39615dc96a
+SHA512 (libhandy-v0.80.0.tar.gz) = 7964cccc8b60c9969d62c7e790f97aa82411b331013d52fc8e84fb3c8fd01d1ac3bc73f92933cd6689eca31e5d17792c464b3056274b962ba32e4acf14e4cd85