diff --git a/pam_mount.changes b/pam_mount.changes index 7c01aa0..685707d 100644 --- a/pam_mount.changes +++ b/pam_mount.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 26 20:18:51 UTC 2020 - Jan Engelhardt + +- Restore symlinks while util-linux is pending + ------------------------------------------------------------------- Fri Nov 20 10:42:59 UTC 2020 - Jan Engelhardt diff --git a/pam_mount.spec b/pam_mount.spec index f41b69f..f3eefb5 100644 --- a/pam_mount.spec +++ b/pam_mount.spec @@ -106,13 +106,17 @@ and transparent use of the OS's crypto layer. %install %make_install +b="%buildroot" # Remove static and libtool version -rm -f "%buildroot/%_lib/security"/*.{a,la} "%buildroot/%_libdir"/*.la +rm -f "$b/%_lib/security"/*.{a,la} "$b/%_libdir"/*.la #install the docs -mkdir -p %buildroot/%_docdir/%name/examples -cp doc/bugs.txt doc/news.txt LICENSE* doc/faq.txt doc/todo.txt doc/options.txt doc/pam_mount.txt %buildroot/%_docdir/%name/ -install -m 755 %SOURCE1 %buildroot/%_docdir/%name/examples/ -install -m 755 %SOURCE2 %buildroot/%_docdir/%name/examples/ +mkdir -p "$b/%_docdir/%name/examples" +cp -a doc/bugs.txt doc/news.txt LICENSE* doc/faq.txt doc/todo.txt doc/options.txt doc/pam_mount.txt "$b/%_docdir/%name/" +install -m 755 %SOURCE1 "$b/%_docdir/%name/examples/" +install -m 755 %SOURCE2 "$b/%_docdir/%name/examples/" +mkdir -p "$b/sbin" +ln -s /usr/sbin/mount.crypt "$b/sbin" +ln -s /usr/sbin/umount.crypt "$b/sbin" %fdupes %buildroot/%_prefix %post @@ -143,6 +147,7 @@ fi %_sbindir/umount.* %_sbindir/pmvarrun %_sbindir/pmt-ehd +/sbin/*mount* %config(noreplace) %_sysconfdir/security/pam_mount.conf.xml %doc %_mandir/man5/pam_mount.conf.5.gz %doc %_mandir/man8/*.8.gz