.gitignore

@@ -1 +1 @@
-SOURCES/gnome-keyring-40.0.tar.xz
+SOURCES/gnome-keyring-3.28.2.tar.xz

.gnome-keyring.metadata

@@ -1 +1 @@
-0e5287f5e0c8a0dcce960824bd4e43b223ada2a7 SOURCES/gnome-keyring-40.0.tar.xz
+a28f2e9ddee20c28922e7979cd3a4bb2b5c2e2ab SOURCES/gnome-keyring-3.28.2.tar.xz

SPECS/gnome-keyring.spec

@@ -3,14 +3,14 @@
 %global gcrypt_version 1.2.2
 
 Name: gnome-keyring
-Version: 40.0
+Version: 3.28.2
-Release: 4%{?dist}
+Release: 2%{?dist}
 Summary: Framework for managing passwords and other secrets
 
 License: GPLv2+ and LGPLv2+
 URL:     https://wiki.gnome.org/Projects/GnomeKeyring
-Source0: https://download.gnome.org/sources/%{name}/40/%{name}-%{version}.tar.xz
+Source0: https://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz
-# https://issues.redhat.com/browse/RHEL-25560
+# https://issues.redhat.com/browse/RHEL-11916
 Patch0:  gnome-keyring-40.0-ssh-agent-avoid-deadlock.patch
 Patch1:  gnome-keyring-40.0-strncpy.patch
 
@@ -19,7 +19,6 @@ BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
 BuildRequires: pkgconfig(p11-kit-1)
 BuildRequires: docbook-dtds
 BuildRequires: docbook-style-xsl
-BuildRequires: gcc
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: libcap-ng-devel
@@ -29,7 +28,6 @@ BuildRequires: pam-devel
 BuildRequires: /usr/bin/ssh-add
 BuildRequires: /usr/bin/ssh-agent
 BuildRequires: /usr/bin/xsltproc
-BuildRequires: make
 
 Requires: /usr/bin/ssh-add
 Requires: /usr/bin/ssh-agent
@@ -65,7 +63,7 @@ automatically unlock the "login" keyring when the user logs in.
 # avoid unneeded direct dependencies
 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
 
-%make_build
+make %{?_smp_mflags}
 
 
 %install
@@ -95,10 +93,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
 %{_sysconfdir}/xdg/autostart/*
 %{_datadir}/GConf/gsettings/*.convert
 %{_datadir}/glib-2.0/schemas/*.gschema.xml
-%{_datadir}/p11-kit/modules/gnome-keyring.module
-%dir %{_datadir}/xdg-desktop-portal
-%dir %{_datadir}/xdg-desktop-portal/portals
-%{_datadir}/xdg-desktop-portal/portals/gnome-keyring.portal
 %{_mandir}/man1/gnome-keyring.1*
 %{_mandir}/man1/gnome-keyring-3.1*
 %{_mandir}/man1/gnome-keyring-daemon.1*
@@ -108,65 +102,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
 
 
 %changelog
-* Fri Apr 12 2024 David King <dking@redhat.com> - 40.0-4
+* Fri Apr 12 2024 David King <dking@redhat.com> - 3.28.2-2
-- Avoid SSH agent deadlocks (RHEL-25560)
+- Avoid SSH agent deadlocks (RHEL-11916)
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-3
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Fri Mar 26 2021 Kalev Lember <klember@redhat.com> - 40.0-1
-- Update to 40.0
-
-* Fri Mar 05 2021 David King <amigadave@amigadave.com> - 3.36.0-6
-- Apply upstream patch to fix capng usage (#1888978)
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-4
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 3.36.0-2
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Wed Mar 11 2020 Kalev Lember <klember@redhat.com> - 3.36.0-1
-- Update to 3.36.0
-
-* Mon Feb 17 2020 Kalev Lember <klember@redhat.com> - 3.35.90-1
-- Update to 3.35.90
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.35.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jan 16 2020 Kalev Lember <klember@redhat.com> - 3.35.1-1
-- Update to 3.35.1
-
-* Mon Sep 30 2019 Kalev Lember <klember@redhat.com> - 3.34.0-1
-- Update to 3.34.0
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.31.91-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Mar 02 2019 Kalev Lember <klember@redhat.com> - 3.31.91-1
-- Update to 3.31.91
-
-* Sun Feb 10 2019 Kalev Lember <klember@redhat.com> - 3.31.90-1
-- Update to 3.31.90
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Tue May 08 2018 Kalev Lember <klember@redhat.com> - 3.28.2-1
 - Update to 3.28.2