diff --git a/.files b/.files index 5de7129..43f6152 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 7fd25dd..f34a2fa 100644 --- a/.rev +++ b/.rev @@ -126,4 +126,12 @@ 888745 + + c4ffd74ec56bd5109043019ee2ba7056 + 0.12.3 + + dimstar_suse + + 956858 + diff --git a/Fix-build-meson-060.patch b/Fix-build-meson-060.patch new file mode 100644 index 0000000..0eac97f --- /dev/null +++ b/Fix-build-meson-060.patch @@ -0,0 +1,18 @@ +diff -Nur orig-almanah-0.12.3/data/meson.build almanah-0.12.3/data/meson.build +--- orig-almanah-0.12.3/data/meson.build 2022-02-22 17:53:40.373799613 +0100 ++++ almanah-0.12.3/data/meson.build 2022-02-22 18:00:31.314503166 +0100 +@@ -1,6 +1,5 @@ + desktop = 'almanah.desktop' + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -19,7 +18,6 @@ + + appdata = 'almanah.appdata.xml' + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, diff --git a/almanah.changes b/almanah.changes index 7e094e7..9639ea6 100644 --- a/almanah.changes +++ b/almanah.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 22 16:58:24 UTC 2022 - Bjørn Lie + +- Add Fix-build-meson-060.patch: Fix build with meson 0.60.x and + newer. + +------------------------------------------------------------------- Mon Apr 26 17:37:56 UTC 2021 - Ferdinand Thiessen - Update to version 0.12.3 diff --git a/almanah.spec b/almanah.spec index 2eb5ff6..0b388bd 100644 --- a/almanah.spec +++ b/almanah.spec @@ -24,6 +24,8 @@ License: GPL-3.0+ Group: Productivity/Office/Other URL: https://gitlab.gnome.org/GNOME/almanah Source: https://download.gnome.org/sources/almanah/0.12/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM Fix-build-meson-060.patch bjorn.lie@gmail.com -- Fix build with meson 0.60.x and newer +Patch: Fix-build-meson-060.patch BuildRequires: gpgme-devel BuildRequires: hicolor-icon-theme