diff --git a/pam_mount.changes b/pam_mount.changes index a560116..76c607a 100644 --- a/pam_mount.changes +++ b/pam_mount.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 13:14:00 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Mon Oct 10 18:57:18 UTC 2022 - Ferdinand Thiessen diff --git a/pam_mount.spec b/pam_mount.spec index c5b93f1..36735e5 100644 --- a/pam_mount.spec +++ b/pam_mount.spec @@ -116,7 +116,7 @@ mkdir -p "$b/%_docdir/%name/examples" cp -a doc/bugs.txt doc/news.rst LICENSE* doc/faq.txt doc/todo.txt doc/options.txt "$b/%_docdir/%name/" install -m 755 %SOURCE1 "$b/%_docdir/%name/examples/" install -m 755 %SOURCE2 "$b/%_docdir/%name/examples/" -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 mkdir -p "$b/sbin" ln -s /usr/sbin/mount.crypt "$b/sbin" ln -s /usr/sbin/umount.crypt "$b/sbin" @@ -156,7 +156,7 @@ fi %_sbindir/umount.* %_sbindir/pmvarrun %_sbindir/pmt-ehd -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /sbin/*mount* %endif %config(noreplace) %_sysconfdir/security/pam_mount.conf.xml