From 76487bf872e68e07cb83897ec4d865e79492e90446bd403977f0a0a78b6db15d Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 2 Aug 2017 17:51:38 +0000 Subject: [PATCH] - Only use pam-config on TW, where it will be available soon OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/pam_kwallet?expand=0&rev=36 --- baselibs.conf | 3 +++ pam_kwallet.changes | 1 + pam_kwallet.spec | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/baselibs.conf b/baselibs.conf index 1f9893a..9134c05 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,7 @@ pam_kwallet requires "pam_kwallet = " supplements "packageand(pam_kwallet:pam-)" + post "%if 0%{?suse_version} >= 1330" post "%{_sbindir}/pam-config -a --kwallet5 || :" + post "%endif" + post ":" diff --git a/pam_kwallet.changes b/pam_kwallet.changes index 6180a80..e21f552 100644 --- a/pam_kwallet.changes +++ b/pam_kwallet.changes @@ -5,6 +5,7 @@ Wed Aug 2 08:48:28 UTC 2017 - fabian@ritter-vogt.de necessary for pam-config integration - Add baselibs.conf for -32bit pkg - Register with pam-config automatically (boo#1029942) +- Only use pam-config on TW, where it will be available soon ------------------------------------------------------------------- Tue Jul 18 16:14:48 CEST 2017 - fabian@ritter-vogt.de diff --git a/pam_kwallet.spec b/pam_kwallet.spec index 00b3647..a13e5fc 100644 --- a/pam_kwallet.spec +++ b/pam_kwallet.spec @@ -32,7 +32,9 @@ BuildRequires: pam-devel BuildRequires: socat BuildRequires: xz Requires: %{name}-common = %{version} +%if 0%{?suse_version} >= 1330 Requires(postun): coreutils pam pam-config +%endif %description This PAM module allows you to automatically open your kwallet @@ -58,6 +60,7 @@ module. %install %kf5_makeinstall -C build +%if 0%{?suse_version} >= 1330 # Due to boo#728586 it is necessary to duplicate this in the 32bit variant. # So you need to edit baselibs.conf if you change this. %post @@ -67,6 +70,7 @@ module. if [ "$1" = "0" ]; then %{_sbindir}/pam-config -d --kwallet5 || : fi +%endif %files %defattr(-,root,root)