Resolve compilation failures

(cherry picked from commit 2312538a166736de04e97b5e50c98339c6ade51c)

gkr-Use-0-on-empty-flags.patch

@@ -1,30 +0,0 @@
-From d9db29db567012b7c72e85e1be1fbf55fcc9b667 Mon Sep 17 00:00:00 2001
-From: Niels De Graef <nielsdegraef@gmail.com>
-Date: Sat, 11 May 2019 09:02:34 +0200
-Subject: [PATCH] gkr: Use 0 on empty flags
-
-A Flags-type variable without any flag set can be replaced with 0, so
-this is a safe thing to do. It also prevents us from having to deal with
-the accidental API break in libsecret (see
-https://gitlab.gnome.org/GNOME/libsecret/merge_requests/19)
----
- gkr/gkr-keyring-add.vala | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/gkr/gkr-keyring-add.vala b/gkr/gkr-keyring-add.vala
-index 4e92a5207..f60c9a227 100644
---- a/gkr/gkr-keyring-add.vala
-+++ b/gkr/gkr-keyring-add.vala
-@@ -41,8 +41,7 @@ public class Seahorse.Gkr.KeyringAdd : Gtk.Dialog {
- 
-         var cancellable = Dialog.begin_request(this);
-         var service = Backend.instance().service;
--        Secret.Collection.create.begin(service, this.name_entry.text, null,
--                                       Secret.CollectionCreateFlags.COLLECTION_CREATE_NONE,
-+        Secret.Collection.create.begin(service, this.name_entry.text, null, 0,
-                                        cancellable, (obj, res) => {
-             /* Clear the operation without cancelling it since it is complete */
-             Dialog.complete_request(this, false);
--- 
-GitLab
-

seahorse.spec

@@ -1,18 +1,18 @@
 Name:                seahorse
-Version:             3.30.1.1
+Version:             41.0
-Release:             3
+Release:             1
 Summary:             A GNOME application for managing encryption keys
 License:             GPLv2+ and LGPLv2+
 URL:                 https://wiki.gnome.org/Apps/Seahorse
-Source:              https://download.gnome.org/sources/seahorse/3.30/seahorse-%{version}.tar.xz
+Source:              https://download.gnome.org/sources/%{name}/41/%{name}-%{version}.tar.xz
 
-Patch0001:           gkr-Use-0-on-empty-flags.patch
 
 BuildRequires:       pkgconfig(avahi-client) pkgconfig(avahi-glib) pkgconfig(gio-2.0)
 BuildRequires:       pkgconfig(gck-1) pkgconfig(gcr-3) pkgconfig(gtk+-3.0)
 BuildRequires:       pkgconfig(libsecret-unstable) pkgconfig(libsoup-2.4) desktop-file-utils gettext
 BuildRequires:       gpgme-devel >= 1.0 gnupg2 itstool libSM-devel meson openldap-devel
 BuildRequires:       openssh-clients vala /usr/bin/appstream-util
+BuildRequires:       pkgconfig(libhandy-1) pkgconfig(pwquality) docbook-style-xsl
 Requires:            pinentry-gui
 Obsoletes:           seahorse-devel < 3.1.4-2
 Obsoletes:           seahorse-plugins < 2.91.6-0.8
@@ -26,7 +26,7 @@ along with  an easy to use interface  for encryption  operations.
 %autosetup -n seahorse-%{version} -p1
 
 %build
-%meson
+%meson -Dmanpage=true
 %meson_build
 find . -type f -name "*.c" -exec chmod a-x {} ';'
 
@@ -36,23 +36,27 @@ find . -type f -name "*.c" -exec chmod a-x {} ';'
 
 %check
 appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml
-desktop-file-validate %{buildroot}/%{_datadir}/applications/seahorse.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.seahorse.Application.desktop
 
 %files -f seahorse.lang
 %license COPYING*
 %{_bindir}/*
 %{_libexecdir}/seahorse/
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/apps/{seahorse.png,seahorse-preferences.png}
+%{_datadir}/icons/hicolor/scalable/apps/org.gnome.seahorse.Application.svg
-%{_datadir}/icons/hicolor/symbolic/apps/seahorse-symbolic.svg
+%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.seahorse.Application-symbolic.svg
 %{_datadir}/dbus-1/services/org.gnome.seahorse.Application.service
 %{_datadir}/{glib-2.0/schemas/*.gschema.xml,metainfo/*.appdata.xml}
+%dir %{_datadir}/gnome-shell/
+%dir %{_datadir}/gnome-shell/search-providers/
 %{_datadir}/gnome-shell/search-providers/seahorse-search-provider.ini
 %{_datadir}/seahorse/
 %{_mandir}/man1/*.1*
-%exclude %{_datadir}/icons/hicolor/icon-theme.cache
 
 %changelog
+* Fri Apr 8 2022 yaoxin <yaoxin30@huawei.com> - 41.0-1
+- Resolve compilation failures
+
 * Wed Jul 29 2020 lingsheng <lingsheng@huawei.com> - 3.30.1.1-3
 - fix build fail: gkr use 0 on empty flags