diff --git a/pam_kwallet.changes b/pam_kwallet.changes index 95397b5..f230b03 100644 --- a/pam_kwallet.changes +++ b/pam_kwallet.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 13:13:43 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Tue Nov 29 14:47:24 UTC 2022 - Fabian Vogt diff --git a/pam_kwallet.spec b/pam_kwallet.spec index e0c9359..e090611 100644 --- a/pam_kwallet.spec +++ b/pam_kwallet.spec @@ -69,7 +69,7 @@ module. %build # Before usrmerge, the PAM module goes into /lib*/security/ %{cmake_kf5 -d build -- \ - %if !0%{?usrmerged} + %if 0%{?suse_version} < 1550 -DKDE_INSTALL_LIBDIR=/%{_lib} %endif } @@ -100,7 +100,7 @@ module. %files %license LICENSES/* -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 %{_pam_moduledir}/pam_kwallet5.so %else /%{_lib}/security/pam_kwallet5.so