Accepting request 956653 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/956653
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libsecret?expand=0&rev=30

libsecret-0.20.4.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28
-size 529916

libsecret-0.20.5.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d
+size 187340

libsecret-handle-UnknownObject.patch

@@ -1,30 +0,0 @@
-From d620c79d83acc1bae0bbd7153a691f952b74ca31 Mon Sep 17 00:00:00 2001
-From: Slava Aseev <ptrnine@altlinux.org>
-Date: Mon, 16 Aug 2021 19:25:56 +0300
-Subject: [PATCH] Create default collection after DBus.Error.UnknownObject
-
-Some Secret Service API backend implementations (like keepassxc)
-throws UnknownObject (instead of UnknownMethod as gnome-keyring do)
-after creating an item in the non-existent
-/org/freedesktop/secrets/aliases/default.
----
- libsecret/secret-methods.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libsecret/secret-methods.c b/libsecret/secret-methods.c
-index c4decf8..b9b696e 100644
---- a/libsecret/secret-methods.c
-+++ b/libsecret/secret-methods.c
-@@ -1050,7 +1050,8 @@ on_store_create (GObject *source,
- 
- 	if (!store->created_collection &&
- 	    (g_error_matches (error, SECRET_ERROR, SECRET_ERROR_NO_SUCH_OBJECT) ||
--	     g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD)) &&
-+	     g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD) ||
-+	     g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_OBJECT)) &&
- 	    g_strcmp0 (store->collection_path, SECRET_ALIAS_PREFIX "default") == 0) {
- 		properties = _secret_collection_properties_new (_("Default keyring"));
- 		secret_service_create_collection_dbus_path (service, properties, "default",
--- 
-GitLab
-

libsecret.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Feb 22 09:28:12 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 0.20.5:
+  + Drop autotools-based build
+  + Use G_GNUC_NULL_TERMINATED where appropriate
+  + collection, methods, prompt: Port to GTask
+  + Detect local storage in snaps in the same way as flatpaks
+  + Add bash-completion for secret-tool
+  + secret-tool: Add locking capabilities to secret tool
+  + secret-file-backend: Avoid closing the same file descriptor
+    twice
+  + Add support for TPM2 based secret storage
+  + Create default collection after DBus.Error.UnknownObject
+  + Port documentation to gi-docgen
+  + GI annotation and documentation fixes
+  + Build fixes
+  + Updated translations.
+- Replace gtk-doc with pkgconfig(gi-docgen) BuildRequires following
+  upstreams port.
+- Drop patch fixed upstream: libsecret-handle-UnknownObject.patch
+
 -------------------------------------------------------------------
 Wed Sep 22 06:23:46 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com>
 

libsecret.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libsecret
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %define have_lang 1
 Name:           libsecret
-Version:        0.20.4
+Version:        0.20.5
 Release:        0
 Summary:        Library for accessing the Secret Service API
 License:        LGPL-2.1-or-later
@@ -26,8 +26,6 @@ URL:            https://wiki.gnome.org/Projects/Libsecret
 Source0:        https://download.gnome.org/sources/libsecret/0.20/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 
-# PATCH-FIX-UPSTREAM libsecret-handle-UnknownObject.patch bsc#1190499, glgo#GNOME/libsecret!94 alynx.zhou@suse.com -- handle UnknownObject which is thrown by some implementations
-Patch0:         libsecret-handle-UnknownObject.patch
 ## SLE-only patches start at 1000
 # PATCH-FIX-SLE libsecret-bsc932232-use-libgcrypt-allocators.patch bsc#932232 hpj@suse.com -- use libgcrypt allocators for FIPS mode
 Patch1000:      libsecret-bsc932232-use-libgcrypt-allocators.patch
@@ -35,12 +33,12 @@ Patch1000:      libsecret-bsc932232-use-libgcrypt-allocators.patch
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
 BuildRequires:  gobject-introspection-devel >= 1.29
-BuildRequires:  gtk-doc
 BuildRequires:  libgcrypt-devel >= 1.2.2
 BuildRequires:  meson >= 0.50
 BuildRequires:  pkgconfig
 BuildRequires:  vala >= 0.17.2.12
 BuildRequires:  xsltproc
+BuildRequires:  pkgconfig(gi-docgen)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.44.0
@@ -93,14 +91,13 @@ secrets. It communicates with the "Secret Service" using DBus.
 
 %prep
 %setup -q
-%patch0 -p1
 %if 0%{?sle_version}
 %patch1000 -p1
 %endif
 
 %build
 %meson \
-    %{nil}
+	%{nil}
 %meson_build
 
 %install
@@ -127,13 +124,12 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_mandir}/man1/secret-tool.1%{?ext_man}
 
 %files devel
-%doc AUTHORS ChangeLog
 %{_libdir}/libsecret-1.so
 %{_libdir}/pkgconfig/libsecret-1.pc
 %{_libdir}/pkgconfig/libsecret-unstable.pc
 %{_includedir}/libsecret-1/
 %{_datadir}/gir-1.0/Secret-1.gir
-%doc %{_datadir}/gtk-doc/html/libsecret-1/
+%doc %{_datadir}/doc/libsecret-1/
 %dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/libsecret-1.deps
 %{_datadir}/vala/vapi/libsecret-1.vapi