From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Wed, 4 Jan 2023 14:04:39 +0000 (+0100)
Subject: Replace transitional %usrmerged macro with regular version check (boo#1206798)
X-Git-Tag: v0.10.5~71^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F765%2Fhead;p=thirdparty%2Fsnapper.git

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

diff --git a/package/snapper.changes b/package/snapper.changes
index 8f0f10dc..d3d4b806 100644
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 13:20:38 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Thu Dec 22 09:03:33 CET 2022 - aschnell@suse.com
 
diff --git a/snapper.spec.in b/snapper.spec.in
index 5129098a..9fed7e9c 100644
--- a/snapper.spec.in
+++ b/snapper.spec.in
@@ -22,7 +22,7 @@
 %endif
 
 # Location for PAM module
-%if 0%{?usrmerged}
+%if 0%{?suse_version} >= 1550
 %define pam_security_dir %{_libdir}/security
 %else
 %define pam_security_dir /%{_lib}/security