diff --git a/bijiben.spec b/bijiben.spec index 07a6398..13347fb 100644 --- a/bijiben.spec +++ b/bijiben.spec @@ -1,6 +1,6 @@ Name: bijiben Version: 40.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple Note Viewer # Bijiben is GPLv3+ apart a few files "LGPLv2 or LGPLv3" @@ -9,6 +9,8 @@ License: GPLv3+ and LGPLv3 and LGPLv2+ Url: http://www.gnome.org Source0: http://download.gnome.org/sources/%{name}/40/%{name}-%{version}.tar.xz +Patch01: webkitdep.patch + BuildRequires: desktop-file-utils BuildRequires: itstool BuildRequires: gettext @@ -19,13 +21,13 @@ BuildRequires: pkgconfig(goa-1.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(libecal-2.0) -BuildRequires: pkgconfig(libedataserverui-1.2) +BuildRequires: pkgconfig(libecal-2.0) >= 3.45.1 +BuildRequires: pkgconfig(libedataserver-1.2) >= 3.45.1 BuildRequires: pkgconfig(libhandy-1) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(tracker-sparql-3.0) BuildRequires: pkgconfig(uuid) -BuildRequires: pkgconfig(webkit2gtk-4.0) +BuildRequires: pkgconfig(webkit2gtk-4.1) >= 2.36 BuildRequires: vala BuildRequires: yelp-tools BuildRequires: libappstream-glib-devel @@ -43,7 +45,7 @@ notes, quickly find it back. %prep -%autosetup -p1 +%autosetup -p1 -S gendiff %build @@ -89,6 +91,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Notes.deskt %changelog +* Wed Jul 20 2022 Milan Crha - 40.1-4 +- Rebuilt for evolution-data-server soname version bump +- Build with WebKitGTK 4.1 API (using libsoup3) + * Wed Jan 19 2022 Fedora Release Engineering - 40.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/webkitdep.patch b/webkitdep.patch new file mode 100644 index 0000000..25af8af --- /dev/null +++ b/webkitdep.patch @@ -0,0 +1,21 @@ +diff -up bijiben-40.1 bijiben-40 +diff -up bijiben-40.1/meson.build.1 bijiben-40.1/meson.build +--- bijiben-40.1/meson.build.1 2022-07-20 09:56:11.815124613 +0200 ++++ bijiben-40.1/meson.build 2022-07-20 09:56:57.023115055 +0200 +@@ -120,13 +120,13 @@ bijiben_deps = [ + dependency('goa-1.0'), + dependency('gtk+-3.0', version: '>= 3.19.3'), + dependency('json-glib-1.0'), +- dependency('libecal-2.0', version: '>= 3.33.2'), +- dependency('libedataserver-1.2', version: '>= 3.13.90'), ++ dependency('libecal-2.0', version: '>= 3.45.1'), ++ dependency('libedataserver-1.2', version: '>= 3.45.1'), + dependency('libhandy-1', version: '>= 1.0.0'), + dependency('libxml-2.0'), + dependency('libcurl'), + dependency('uuid'), +- dependency('webkit2gtk-4.0', version: '>= 2.26'), ++ dependency('webkit2gtk-4.1', version: '>= 2.36'), + cc.find_library('m') + ] +