.gitignore

@@ -1 +1 @@
-SOURCES/libsecret-0.21.2.tar.xz
+SOURCES/libsecret-0.20.4.tar.xz

.libsecret.metadata

@@ -1 +1 @@
-15c5ff5c7af25311b39ef43c3e64226942cb1601 SOURCES/libsecret-0.21.2.tar.xz
+772953526c734debfd9c07bdd623e1c8ed5a7f09 SOURCES/libsecret-0.20.4.tar.xz

SOURCES/0001-tests-Remove-unnecessary-inclusion-of-gcrypt.h.patch

@@ -1,26 +0,0 @@
-From 7f31c832306c10f4e92ac31124e144abff282e46 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <dueno@src.gnome.org>
-Date: Mon, 11 Dec 2023 08:39:58 +0900
-Subject: [PATCH] tests: Remove unnecessary inclusion of <gcrypt.h>
-
-Signed-off-by: Daiki Ueno <dueno@src.gnome.org>
----
- egg/test-hkdf.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/egg/test-hkdf.c b/egg/test-hkdf.c
-index 289e702..d90233c 100644
---- a/egg/test-hkdf.c
-+++ b/egg/test-hkdf.c
-@@ -32,8 +32,6 @@
- #include "egg/egg-secure-memory.h"
- #include "egg/egg-testing.h"
- 
--#include <gcrypt.h>
--
- #undef G_DISABLE_ASSERT
- 
- EGG_SECURE_DEFINE_GLIB_GLOBALS ();
--- 
-2.43.0
-

SPECS/libsecret.spec

@@ -5,35 +5,24 @@
 %global has_valgrind 1
 %endif
 
-%bcond_without gnutls
-
 Name:           libsecret
-Version:        0.21.2
-Release:        6%{?dist}
+Version:        0.20.4
+Release:        4%{?dist}
 Summary:        Library for storing and retrieving passwords and other secrets
 
-# libsecret/mock/aes.py is Apache-2.0
-# libsecret/mock/hkdf.py is GPL-2.0-or-later OR TGPPL-1.0
-# part of libsecret/mock/dh.py is LicenseRef-Fedora-Public-Domain
-License:        LGPL-2.1-or-later AND Apache-2.0 AND (GPL-2.0-or-later OR TGPPL-1.0) AND LicenseRef-Fedora-Public-Domain
+License:        LGPLv2+
 URL:            https://wiki.gnome.org/Projects/Libsecret
 Source0:        https://download.gnome.org/sources/libsecret/%{release_version}/libsecret-%{version}.tar.xz
-# https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/133
-Patch:          0001-tests-Remove-unnecessary-inclusion-of-gcrypt.h.patch
 
-BuildRequires:  docbook-style-xsl
+BuildRequires: make
 BuildRequires:  gettext
-BuildRequires:  gi-docgen
-BuildRequires:  meson
+BuildRequires:  glib2-devel
+BuildRequires:  gobject-introspection-devel
+BuildRequires:  libgcrypt-devel >= 1.2.2
 BuildRequires:  vala
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(gobject-introspection-1.0)
-%if %{with gnutls}
-BuildRequires:  pkgconfig(gnutls) >= 3.8.2
-%else
-BuildRequires:  pkgconfig(libgcrypt) >= 1.2.2
-%endif
-BuildRequires:  /usr/bin/xsltproc
+BuildRequires:  gtk-doc
+BuildRequires:  libxslt-devel
+BuildRequires:  docbook-style-xsl
 %if 0%{?has_valgrind}
 BuildRequires:  valgrind-devel
 %endif
@@ -56,7 +45,7 @@ developing applications that use %{name}.
 
 
 %prep
-%autosetup -p1
+%setup -q
 
 # Use system valgrind headers instead
 %if 0%{?has_valgrind}
@@ -65,26 +54,21 @@ rm -rf build/valgrind/
 
 
 %build
-%meson \
-%if %{with gnutls}
--Dcrypto=gnutls \
-%else
--Dcrypto=libgcrypt \
-%endif
-%{nil}
-
-%meson_build
+%configure --disable-static
+%make_build
 
 
 %install
-%meson_install
+%make_install
+
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %find_lang libsecret
 
 
 %files -f libsecret.lang
 %license COPYING
-%doc NEWS README.md
+%doc AUTHORS NEWS README
 %{_bindir}/secret-tool
 %{_libdir}/libsecret-1.so.0*
 %dir %{_libdir}/girepository-1.0
@@ -92,7 +76,6 @@ rm -rf build/valgrind/
 %{_mandir}/man1/secret-tool.1*
 
 %files devel
-%license COPYING docs/reference/COPYING
 %{_includedir}/libsecret-1/
 %{_libdir}/libsecret-1.so
 %{_libdir}/pkgconfig/libsecret-1.pc
@@ -103,54 +86,16 @@ rm -rf build/valgrind/
 %dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/libsecret-1.deps
 %{_datadir}/vala/vapi/libsecret-1.vapi
-%doc %{_docdir}/libsecret-1/
+%doc %{_datadir}/gtk-doc/
 
 
 %changelog
-* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.21.2-6
-- Rebuilt for MSVSphere 10
-
-* Mon Aug 19 2024 Tomas Popela <tpopela@redhat.com> - 0.21.2-6
-- Fix SDPX license
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.21.2-5
-- Bump release for June 2024 mass rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Dec 10 2023 Daiki Ueno <dueno@redhat.com> - 0.21.2-2
-- Use GnuTLS as the default crypto backend
-
-* Sat Dec 09 2023 Kalev Lember <klember@redhat.com> - 0.21.2-1
-- Update to 0.21.2
-
-* Tue Sep 19 2023 Kalev Lember <klember@redhat.com> - 0.21.1-1
-- Update to 0.21.1
-
-* Fri Aug 11 2023 Kalev Lember <klember@redhat.com> - 0.21.0-1
-- Update to 0.21.0
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Feb 21 2022 David King <amigadave@amigadave.com> - 0.20.5-1
-- Update to 0.20.5
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.20.4-4
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.20.4-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild