!30 [sync] PR-29: fix changelog error

From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng

backport-Fix-unknown-kw-argument-in-gnome-generate_gir.patch

@@ -1,58 +0,0 @@
-From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Wed, 12 Jan 2022 00:24:20 +0100
-Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir
-
-This argument has been removed in Meson 0.61.0:
-
-    gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
-
-https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de:
-
-> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it.
-
-Fixes #89
----
- gck/meson.build | 1 -
- gcr/meson.build | 1 -
- ui/meson.build  | 1 -
- 3 files changed, 3 deletions(-)
-
-diff --git a/gck/meson.build b/gck/meson.build
-index 756b4866..a21a1e9d 100644
---- a/gck/meson.build
-+++ b/gck/meson.build
-@@ -131,7 +131,6 @@ if get_option('introspection')
-     sources: gck_gir_sources,
-     namespace: 'Gck',
-     nsversion: '@0@'.format(gck_major_version),
--    packages: gck_deps,
-     export_packages: 'gck-@0@'.format(gck_major_version),
-     includes: [ 'GObject-2.0', 'Gio-2.0' ],
-     header: 'gck/gck.h',
-diff --git a/gcr/meson.build b/gcr/meson.build
-index 2233a445..c83641ba 100644
---- a/gcr/meson.build
-+++ b/gcr/meson.build
-@@ -190,7 +190,6 @@ if get_option('introspection')
-     sources: [ gcr_base_public_sources, gcr_base_headers ],
-     namespace: 'Gcr',
-     nsversion: '@0@'.format(gcr_major_version),
--    packages: gcr_base_deps,
-     export_packages: 'gcr-base-@0@'.format(gcr_major_version),
-     includes: [
-       'GObject-2.0',
-diff --git a/ui/meson.build b/ui/meson.build
-index e656ea23..32ee057f 100644
---- a/ui/meson.build
-+++ b/ui/meson.build
-@@ -152,7 +152,6 @@ if get_option('introspection')
-     export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
-     identifier_prefix: 'Gcr',
-     symbol_prefix: 'gcr',
--    packages: gcr_ui_deps,
-     includes: [
-       'GObject-2.0',
-       'Gio-2.0',
--- 
-GitLab

gcr.spec

@@ -3,29 +3,29 @@
 %endif
 
 Name:           gcr
-Version:        3.41.0
+Version:        3.41.2
 Release:        2
 Summary:        A library for bits of crypto UI and parsing
 License:        LGPLv2+
 URL:            https://wiki.gnome.org/Projects/CryptoGlue
 Source0:        https://download-fallback.gnome.org/sources/%{name}/3.41/%{name}-%{version}.tar.xz
 
+Patch9000:      remove-sensitive-info.patch
+
 BuildRequires:  pkgconfig(gio-unix-2.0) pkgconfig(gobject-introspection-1.0) pkgconfig(gtk+-3.0) pkgconfig(p11-kit-1)
 BuildRequires:  chrpath docbook-style-xsl libgcrypt-devel desktop-file-utils intltool vala gnupg2 libxslt meson
-BuildRequires:  gtk-doc gettext cmake pkgconfig(libsecret-1) pkgconfig(libsystemd)
+BuildRequires:  gi-docgen gettext cmake pkgconfig(libsecret-1) pkgconfig(libsystemd)
 %if 0%{?has_valgrind}
 BuildRequires:  valgrind-devel
 %endif
 BuildRequires:  /usr/bin/gpg2
-BuildRequires:  /usr/bin/ssh-add
-BuildRequires:  /usr/bin/ssh-agent
-BuildRequires:  /usr/bin/xsltproc
- 
-Requires: %{name}-base%{?_isa} = %{version}-%{release}
-Requires: /usr/bin/ssh-add
-Requires: /usr/bin/ssh-agent
+BuildRequires:  openssh-clients
+BuildRequires:  openssh-clients
+BuildRequires:  libxslt
 
-Patch6000:	backport-Fix-unknown-kw-argument-in-gnome-generate_gir.patch
+Requires: %{name}-base%{?_isa} = %{version}-%{release}
+Requires: openssh-clients
+Requires: openssh-clients
 
 %description
 gcr is a library for displaying certificates, and crypto UI, accessing key stores. It also provides a viewer for
@@ -41,7 +41,7 @@ The gcr-devel package includes the header files for the gcr library.
 %package base
 Summary: Library files for gcr
 Conflicts: %{name} < 3.28.1-3
- 
+
 %description base
 The gcr-base package includes the gcr-base library.
 
@@ -49,7 +49,7 @@ The gcr-base package includes the gcr-base library.
 %autosetup -n %{name}-%{version} -p1
 # Use system valgrind headers instead
 %if 0%{?has_valgrind}
-rm -rf build/valgrind/ 
+rm -rf build/valgrind/
 %endif
 
 %build
@@ -64,13 +64,10 @@ rm -rf build/valgrind/
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
 
 %post
-%systemd_user_post gcr-ssh-agent.service
- 
+
 %preun
-%systemd_user_preun gcr-ssh-agent.service
- 
+
 %postun
-%systemd_user_postun_with_restart gcr-ssh-agent.service
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -88,14 +85,14 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/mime/packages/gcr-crypto-types.xml
 %{_libexecdir}/gcr-prompter
-%{_libexecdir}/gcr-ssh-agent
+%exclude %{_libexecdir}/gcr-ssh-agent
 %{_libexecdir}/gcr-ssh-askpass
 %{_datadir}/dbus-1/services/org.gnome.keyring.PrivatePrompter.service
 %{_datadir}/dbus-1/services/org.gnome.keyring.SystemPrompter.service
 %{_datadir}/applications/gcr-prompter.desktop
-%{_userunitdir}/gcr-ssh-agent.service
-%{_userunitdir}/gcr-ssh-agent.socket
- 
+%exclude %{_userunitdir}/gcr-ssh-agent.service
+%exclude %{_userunitdir}/gcr-ssh-agent.socket
+
 %files devel
 %{_includedir}/gck-1
 %{_includedir}/gcr-3
@@ -107,18 +104,30 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
 %{_libdir}/pkgconfig/gcr-base-3.pc
 %{_libdir}/pkgconfig/gcr-ui-3.pc
 %{_datadir}/gir-1.0
-%dir %{_datadir}/gtk-doc
-%dir %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/gck
-%{_datadir}/gtk-doc/html/gcr
+%{_datadir}/doc
 %{_datadir}/vala/
- 
+
 %files base
 %{_libdir}/libgck-1.so.0*
 %{_libdir}/libgcr-base-3.so.1*
 
 %changelog
-* Mon Jun 20 wuchaochao <wuchaochao4@h-partners.com> - 3.41.0-2
+* Wed Nov 06 2024 zhangpan <zhangpan103@h-partners.com> - 3.41.2-2
+- fix changelog error
+
+* Mon Feb 05 2024 zhangpan <zhangpan103@h-partners.com> - 3.41.2-1
+- update to 3.41.2
+
+* Thu Mar 02 2023 wenlong ding <wenlong.ding@turbolinux.com.cn> - 3.41.1-3
+- Exclude confics file which already in gcr4
+
+* Mon Feb 13 2023 zhangpan <zhangpan103@h-partners.com> - 3.41.1-2
+- remove sensitive info
+
+* Fri Nov 11 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 3.41.1-1
+- update to gcr-3.41.1
+
+* Mon Jun 20 2022 wuchaochao <wuchaochao4@h-partners.com> - 3.41.0-2
 - Fix unknown kw argument in gnome.generate_gir
 
 * Mon Dec 6 2021 hanhui <hanhui15@huawei.com> - 3.41.0-1

remove-sensitive-info.patch

@@ -0,0 +1,25 @@
+From d12a449ba5ff74dc9a03755610f7a24e61e5c062 Mon Sep 17 00:00:00 2001
+From: zhouwenpei <zhouwenpei1@h-partners.com>
+Date: Sat, 28 Jan 2023 17:27:58 +0800
+Subject: [PATCH] remove sensitive information
+ 
+---
+ gcr/gcr-ssh-askpass.c | 2 --
+ 1 file changed, 2 deletions(-)
+ 
+diff --git a/gcr/gcr-ssh-askpass.c b/gcr/gcr-ssh-askpass.c
+index fd9e20b..b4b33d4 100644
+--- a/gcr/gcr-ssh-askpass.c
++++ b/gcr/gcr-ssh-askpass.c
+@@ -193,8 +193,6 @@ askpass_thread (gpointer data)
+ 	if (input->len == 0)
+ 		g_string_append (input, _("Enter your OpenSSH passphrase"));
+ 
+-	g_debug ("asking for ssh-askpass password: %s", input->str);
+-
+ 	password = g_tls_password_new (G_TLS_PASSWORD_NONE, input->str);
+ 	res = g_tls_interaction_invoke_ask_password (ctx->interaction, password, ctx->cancellable, &error);
+ 
+-- 
+2.33.0
+