From 57d06da2bc807b355327b34e3f9c823a14fe475d Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: May 29 2020 19:28:22 +0000 Subject: Update to 0.17.0 Build with system libhandy-1 --- diff --git a/.gitignore b/.gitignore index c36c826..13edf40 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /Komikku-v0.15.0.tar.gz /Komikku-v0.16.0.tar.gz /libhandy-v0.80.0.tar.gz +/Komikku-v0.17.0.tar.gz diff --git a/komikku.spec b/komikku.spec index a56585f..2288c6b 100644 --- a/komikku.spec +++ b/komikku.spec @@ -2,17 +2,14 @@ %global uuid info.febvre.%{appname} Name: komikku -Version: 0.16.0 +Version: 0.17.0 Release: 1%{?dist} 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 -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 +BuildArch: noarch BuildRequires: desktop-file-utils BuildRequires: intltool @@ -22,13 +19,7 @@ BuildRequires: meson >= 0.50.0 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 +BuildRequires: pkgconfig(libhandy-1) Requires: hicolor-icon-theme Requires: python3-beautifulsoup4 @@ -36,8 +27,6 @@ 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 @@ -59,33 +48,17 @@ with the Librem 5 phone. %prep %autosetup -n %{appname}-v%{version} -p1 -%autosetup -n %{appname}-v%{version} -D -T -a1 %build -# 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 - -export PKG_CONFIG_PATH=%{buildroot}/usr/lib64/pkgconfig %meson %meson_build + + +%install %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 @@ -104,12 +77,12 @@ 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 +* Fri May 29 2020 Artem Polishchuk - 0.17.0-1 +- Update to 0.17.0 +- Build with system libhandy-1 + * Sun May 24 2020 Artem Polishchuk - 0.16.0-1 - Update to 0.16.0 - Bundle libhandy-1 diff --git a/sources b/sources index f302f49..8672788 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libhandy-v0.80.0.tar.gz) = 7964cccc8b60c9969d62c7e790f97aa82411b331013d52fc8e84fb3c8fd01d1ac3bc73f92933cd6689eca31e5d17792c464b3056274b962ba32e4acf14e4cd85 +SHA512 (Komikku-v0.17.0.tar.gz) = 02a94903f4e75efe98ecb77f80c53ca73c8770eb42aaf87d9d69879c70f2f4e25000fa50a3bb3b37dffd7d4a41eaf814bd68c9a358cb256387c22b8d8e9cb99d