From 38fba7e602688d33b805a58e4caf745aa5904d2f971266bb9c06065f244a5eeb Mon Sep 17 00:00:00 2001 From: Jason Sikes Date: Sat, 20 Aug 2022 00:46:37 +0000 Subject: [PATCH] Accepting request 991716 from home:pgajdos - use pam rpm macros [bsc#1190957] OBS-URL: https://build.opensuse.org/request/show/991716 OBS-URL: https://build.opensuse.org/package/show/security:chipcard/pam_pkcs11?expand=0&rev=31 --- pam_pkcs11.changes | 5 +++++ pam_pkcs11.spec | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pam_pkcs11.changes b/pam_pkcs11.changes index a12f1e6..f976a6b 100644 --- a/pam_pkcs11.changes +++ b/pam_pkcs11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 29 08:49:15 UTC 2022 - pgajdos@suse.com + +- use pam rpm macros [bsc#1190957] + ------------------------------------------------------------------- Sat Jan 15 10:26:28 UTC 2022 - Andreas Stieger diff --git a/pam_pkcs11.spec b/pam_pkcs11.spec index 142649f..cd789b0 100644 --- a/pam_pkcs11.spec +++ b/pam_pkcs11.spec @@ -107,9 +107,11 @@ sed -i '/^HTML_TIMESTAMP/s/YES/NO/' doc/doxygen.conf.in %install %make_install -mkdir -p %{buildroot}/%{_lib} -mv %{buildroot}%{_libdir}/security %{buildroot}/%{_lib} -rm %{buildroot}%{_libdir}/pam_pkcs11/*.*a %{buildroot}/%{_lib}/security/*.*a +%if 0%{?suse_version} <= 1500 +mkdir -p %{buildroot}%{_pam_moduledir} +mv %{buildroot}%{_libdir}/security/* %{buildroot}%{_pam_moduledir} +%endif +rm %{buildroot}%{_pam_moduledir}/*.la %{buildroot}%{_libdir}/pam_pkcs11/*.la # Hardcoded defaults... no sysconfdir install -dm 755 %{buildroot}%{_sysconfdir}/pam_pkcs11/cacerts install -dm 755 %{buildroot}%{_sysconfdir}/pam_pkcs11/crls @@ -145,7 +147,7 @@ ln -s service %{buildroot}%{_sbindir}/rcpkcs11_eventmgr %exclude %{_docdir}/%{name}/api %{_bindir}/* %{_libdir}/pam_pkcs11 -/%{_lib}/security/*.so +/%{_pam_moduledir}/*.so %{_mandir}/man?/*%{ext_man} %dir %{_sysconfdir}/pam_pkcs11 %dir %{_sysconfdir}/pam_pkcs11/cacerts