Accepting request 928991 from home:jmoellers:branches:Linux-PAM

OBS-URL: https://build.opensuse.org/request/show/928991
OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=75
This commit is contained in:
Jan Engelhardt 2021-11-04 09:55:19 +00:00 committed by Git OBS Bridge
parent ebb361af14
commit 30cf2b48ef
2 changed files with 11 additions and 0 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 3 10:06:25 UTC 2021 - Josef Möllers <josef.moellers@suse.com>
- Make symlinks between /sbin and /usr/sbin conditional as they
are not applicable under UsrMerge.
[pam_mount.spec]
-------------------------------------------------------------------
Mon Jan 4 12:12:40 UTC 2021 - Jan Engelhardt <jengelh@inai.de>

View File

@ -114,11 +114,13 @@ mkdir -p "$b/%_docdir/%name/examples"
cp -a doc/bugs.txt doc/news.txt 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}
mkdir -p "$b/sbin"
ln -s /usr/sbin/mount.crypt "$b/sbin"
ln -s /usr/sbin/umount.crypt "$b/sbin"
ln -s /usr/sbin/mount.crypt_LUKS "$b/sbin"
ln -s /usr/sbin/umount.crypt_LUKS "$b/sbin"
%endif
%fdupes %buildroot/%_prefix
%post
@ -149,7 +151,9 @@ fi
%_sbindir/umount.*
%_sbindir/pmvarrun
%_sbindir/pmt-ehd
%if !0%{?usrmerged}
/sbin/*mount*
%endif
%config(noreplace) %_sysconfdir/security/pam_mount.conf.xml
%doc %_mandir/man5/pam_mount.conf.5.gz
%doc %_mandir/man8/*.8.gz