From 830280e41b607a95750fa09f11094726fbb6c808 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:51:50 +0000 Subject: [PATCH 1/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- almanah.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/almanah.spec b/almanah.spec index 53dec79..527596b 100644 --- a/almanah.spec +++ b/almanah.spec @@ -1,6 +1,6 @@ Name: almanah Version: 0.12.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Application for keeping an encrypted diary License: GPL-3.0-or-later @@ -57,6 +57,9 @@ diary entries using multiple events. %{_datadir}/glib-2.0/schemas/org.gnome.%{name}.gschema.xml %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 0.12.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 0.12.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2e6074fdb71c99c784ae2bda3fdaa33824bbda18 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 13 Jan 2025 09:00:06 +0100 Subject: [PATCH 2/5] Update to 0.12.4 --- 0001-build-Build-with-gcr4-by-default.patch | 72 ------------------- ...positional-i18n.merge_file-arguments.patch | 32 --------- almanah.spec | 27 ++++--- sources | 2 +- 4 files changed, 14 insertions(+), 119 deletions(-) delete mode 100644 0001-build-Build-with-gcr4-by-default.patch delete mode 100644 0001-build-remove-positional-i18n.merge_file-arguments.patch diff --git a/0001-build-Build-with-gcr4-by-default.patch b/0001-build-Build-with-gcr4-by-default.patch deleted file mode 100644 index d565ecb..0000000 --- a/0001-build-Build-with-gcr4-by-default.patch +++ /dev/null @@ -1,72 +0,0 @@ -From cd44b476f4ffbf37c5d5f5b996ecd711db925576 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Tue, 19 Jul 2022 21:25:45 +0200 -Subject: [PATCH] build: Build with gcr4 by default - -Use -Dgcr3=true to build against gcr3 instead. - -The gcr4 is going to replace gcr3, this change prepares it to do. -it also defaults to build with gcr4 for the same reason. ---- - meson.build | 10 +++++++++- - meson_options.txt | 1 + - src/vfs.c | 4 ++++ - 3 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 813e67b..b418dce 100644 ---- a/meson.build -+++ b/meson.build -@@ -35,9 +35,14 @@ gtksourceview = dependency('gtksourceview-3.0') - sqlite = dependency('sqlite3') - cairo = dependency('cairo') - atk = dependency('atk') --gcr = dependency('gcr-base-3') - cryptui = dependency('cryptui-0.0') - -+if get_option('gcr3') -+ gcr = dependency('gcr-base-3') -+else -+ gcr = dependency('gcr-4', version: '>= 3.90.0') -+endif -+ - # Options - evolution_support = get_option('evolution') - spell_checking_support = get_option('spell_checking') -@@ -94,6 +99,9 @@ if have_evolution - # https://gitlab.gnome.org/GNOME/almanah/issues/1 - #conf.set('EDS_DISABLE_DEPRECATED', 1) - endif -+if get_option('gcr3') -+ conf.set('HAVE_GCR3', 1) -+endif - - config = vcs_tag( - input: configure_file( -diff --git a/meson_options.txt b/meson_options.txt -index 85a6860..0c7af1d 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,2 +1,3 @@ - option('evolution', type: 'feature', value: 'enabled', description: 'Enable Evolution calendar integration') - option('spell_checking', type: 'feature', value: 'enabled', description: 'Enable spell checking support') -+option('gcr3', type: 'boolean', value: false, description: 'Build with gcr3; if false, builds with gcr4') -diff --git a/src/vfs.c b/src/vfs.c -index fdc9beb..da238e6 100644 ---- a/src/vfs.c -+++ b/src/vfs.c -@@ -44,7 +44,11 @@ - #include - - #define GCR_API_SUBJECT_TO_CHANGE -+#ifdef HAVE_GCR3 - #include -+#else -+#include -+#endif - #include - #include - #include --- -2.35.1 - diff --git a/0001-build-remove-positional-i18n.merge_file-arguments.patch b/0001-build-remove-positional-i18n.merge_file-arguments.patch deleted file mode 100644 index b836222..0000000 --- a/0001-build-remove-positional-i18n.merge_file-arguments.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8c42a67695621d1e30cec933a04e633e6030bbaf Mon Sep 17 00:00:00 2001 -From: Bobby Rong <931189261@qq.com> -Date: Fri, 25 Mar 2022 03:14:43 +0000 -Subject: [PATCH] build: remove positional i18n.merge_file arguments - -Fixes build with meson 0.61 ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 1a5d86f..0321c32 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,6 +1,5 @@ - desktop = 'almanah.desktop' - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop + '.in', - output: desktop, -@@ -19,7 +18,6 @@ endif - - appdata = 'almanah.appdata.xml' - i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, --- -2.35.1 - diff --git a/almanah.spec b/almanah.spec index 527596b..46bd4cd 100644 --- a/almanah.spec +++ b/almanah.spec @@ -1,26 +1,23 @@ Name: almanah -Version: 0.12.3 -Release: 12%{?dist} +Version: 0.12.4 +Release: 1%{?dist} Summary: Application for keeping an encrypted diary License: GPL-3.0-or-later URL: https://wiki.gnome.org/Apps/Almanah_Diary Source0: https://download.gnome.org/sources/almanah/0.12/almanah-%{version}.tar.xz -Patch01: 0001-build-Build-with-gcr4-by-default.patch -Patch02: 0001-build-remove-positional-i18n.merge_file-arguments.patch - +BuildRequires: appstream BuildRequires: gcc BuildRequires: gettext BuildRequires: gpgme-devel BuildRequires: desktop-file-utils -BuildRequires: libappstream-glib-devel BuildRequires: meson BuildRequires: pkgconfig(cryptui-0.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gcr-4) BuildRequires: pkgconfig(gtkspell3-3.0) -BuildRequires: pkgconfig(gtksourceview-3.0) +BuildRequires: pkgconfig(gtksourceview-4) BuildRequires: pkgconfig(libecal-2.0) >= 3.45.1 BuildRequires: pkgconfig(libedataserver-1.2) >= 3.45.1 BuildRequires: pkgconfig(sqlite3) @@ -46,17 +43,19 @@ diary entries using multiple events. %files -f %{name}.lang %license COPYING -%doc AUTHORS NEWS README.md +%doc AUTHORS NEWS.md README.md %{_bindir}/%{name} -%{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/icons/hicolor/*/actions/%{name}*.svg -%{_datadir}/icons/hicolor/scalable/apps/%{name}-symbolic.svg -%{_datadir}/applications/%{name}.desktop -%{_datadir}/metainfo/%{name}.appdata.xml -%{_datadir}/GConf/gsettings/%{name}.convert +%{_datadir}/icons/hicolor/*/apps/org.gnome.Almanah.png +%{_datadir}/icons/hicolor/scalable/actions/org.gnome.Almanah-tags-symbolic.svg +%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Almanah-symbolic.svg +%{_datadir}/applications/org.gnome.Almanah.desktop +%{_datadir}/metainfo/org.gnome.Almanah.metainfo.xml %{_datadir}/glib-2.0/schemas/org.gnome.%{name}.gschema.xml %changelog +* Mon Jan 13 2025 Milan Crha - 0.12.4-1 +- Update to 0.12.4 + * Wed Jul 17 2024 Fedora Release Engineering - 0.12.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index e08c797..54a48ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (almanah-0.12.3.tar.xz) = d12d87a591d47a651c87106c225a69aa9f5c742d299f6ca37e29ecbf9785ce2506f58cc578002df2dcb6c86eb9767c534f2f5d717e9a6f063b125aca89e556b1 +SHA512 (almanah-0.12.4.tar.xz) = 717f3b4aa514be33c236bf0f32866902b0174c28d62ea4b48d1caec2a3a5a85f1105ef491386e336335c619f932a0faf654d047516bcfc81c1ef0ca7b15ef310 From 3a3134eff1a537829cce2827d5c1d880915122d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:53:11 +0000 Subject: [PATCH 3/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- almanah.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/almanah.spec b/almanah.spec index 46bd4cd..941f62f 100644 --- a/almanah.spec +++ b/almanah.spec @@ -1,6 +1,6 @@ Name: almanah Version: 0.12.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Application for keeping an encrypted diary License: GPL-3.0-or-later @@ -53,6 +53,9 @@ diary entries using multiple events. %{_datadir}/glib-2.0/schemas/org.gnome.%{name}.gschema.xml %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 0.12.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jan 13 2025 Milan Crha - 0.12.4-1 - Update to 0.12.4 From 86985db11f97ceebd2332a8ed9a2e292885ad420 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:54:35 +0000 Subject: [PATCH 4/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- almanah.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/almanah.spec b/almanah.spec index 941f62f..5c767af 100644 --- a/almanah.spec +++ b/almanah.spec @@ -1,6 +1,6 @@ Name: almanah Version: 0.12.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Application for keeping an encrypted diary License: GPL-3.0-or-later @@ -53,6 +53,9 @@ diary entries using multiple events. %{_datadir}/glib-2.0/schemas/org.gnome.%{name}.gschema.xml %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 0.12.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 0.12.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 7fb2fefbe1e5dd1704d819102dc280f6620cf85e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:36:07 +0000 Subject: [PATCH 5/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- almanah.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/almanah.spec b/almanah.spec index 5c767af..38d82c6 100644 --- a/almanah.spec +++ b/almanah.spec @@ -1,6 +1,6 @@ Name: almanah Version: 0.12.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Application for keeping an encrypted diary License: GPL-3.0-or-later @@ -53,6 +53,9 @@ diary entries using multiple events. %{_datadir}/glib-2.0/schemas/org.gnome.%{name}.gschema.xml %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 0.12.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 0.12.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild