From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 3 Apr 2021 08:48:47 +0000 (+0200)
Subject: - deps cleanup, versioned Obsoletes, drop no longer used _libexecdir override
X-Git-Tag: auto/th/gnome-keyring-40.0-2~1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=7e059d218e1ee81ef08677e675443be12ccb8e7a;p=packages%2Fgnome-keyring.git

- deps cleanup, versioned Obsoletes, drop no longer used _libexecdir override
---

diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index a1d7383..4197199 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -26,6 +26,7 @@ BuildRequires:	libselinux-devel
 # for some test only
 BuildRequires:	libtasn1-devel >= 0.3.4
 BuildRequires:	libtool
+BuildRequires:	libxslt-progs
 BuildRequires:	p11-kit-devel >= 0.16
 %{?with_p11_tests:BuildRequires:	p11-tests-devel >= 0.1}
 BuildRequires:	pam-devel
@@ -41,12 +42,8 @@ Requires:	hicolor-icon-theme
 Requires:	libgcrypt >= 1.2.2
 Requires:	p11-kit >= 0.16
 Conflicts:	rpm < 4.4.2-0.2
-# sr@Latn vs. sr@latin
-Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_libexecdir	%{_libdir}/%{name}
-
 %description
 GNOME Keyring is a program that keeps password and other secrets for
 users. It is run as a daemon in the session, similar to ssh-agent, and
@@ -64,7 +61,7 @@ Summary(pl.UTF-8):	Moduł PAM do odblokowywania zbiorów kluczy w czasie logowan
 License:	LGPL v2+
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	gnome-keyring-pam
+Obsoletes:	gnome-keyring-pam < 2.30.1-2
 
 %description -n pam-pam_gnome_keyring
 A PAM module that can automatically unlock the "login" keyring when