pool/pam_mount
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1055719 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1055719
OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=81
This commit is contained in:
Jan Engelhardt 2023-01-04 11:08:58 +00:00 committed by Git OBS Bridge
parent e51b25de19
commit 3e18969bb1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pam_mount.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 13:14:00 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
-------------------------------------------------------------------
Mon Oct 10 18:57:18 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>

4
pam_mount.spec
View File

@ -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