From 096375d37835da8b98887f0c9ea3615708316b575eb142376f1c7d6d844c7932 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Wed, 4 Jan 2023 12:31:39 +0000
Subject: [PATCH] Accepting request 1055718 from home:lnussel:usrmerge

Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1055718
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/pam_kwallet?expand=0&rev=254
---
 pam_kwallet.changes | 5 +++++
 pam_kwallet.spec    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

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 <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Tue Nov 29 14:47:24 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
 
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