Accepting request 946158 from home:jmoellers:branches:Linux-PAM
OBS-URL: https://build.opensuse.org/request/show/946158 OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=76
This commit is contained in:
parent
30cf2b48ef
commit
9f9a891ec8
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jan 12 16:09:44 UTC 2022 - Josef Möllers <josef.moellers@suse.com>
|
||||||
|
|
||||||
|
- Use the %_pam_moduledir macro in pam_mount.spec in order to
|
||||||
|
have the package follow UsrMerge.
|
||||||
|
[bsc#1190954, pam_mount.spec]
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Nov 3 10:06:25 UTC 2021 - Josef Möllers <josef.moellers@suse.com>
|
Wed Nov 3 10:06:25 UTC 2021 - Josef Möllers <josef.moellers@suse.com>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package pam_mount
|
# spec file for package pam_mount
|
||||||
#
|
#
|
||||||
# Copyright (c) 2021 SUSE LLC
|
# Copyright (c) 2022 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -101,6 +101,7 @@ and transparent use of the OS's crypto layer.
|
|||||||
%build
|
%build
|
||||||
%configure --disable-static --with-slibdir="/%_lib" \
|
%configure --disable-static --with-slibdir="/%_lib" \
|
||||||
--includedir="%_includedir/libcryptmount" \
|
--includedir="%_includedir/libcryptmount" \
|
||||||
|
--with-slibdir=%{_pam_libdir} \
|
||||||
%{?_with_selinux:--with-selinux}
|
%{?_with_selinux:--with-selinux}
|
||||||
%make_build
|
%make_build
|
||||||
|
|
||||||
@ -108,7 +109,7 @@ and transparent use of the OS's crypto layer.
|
|||||||
%make_install
|
%make_install
|
||||||
b="%buildroot"
|
b="%buildroot"
|
||||||
# Remove static and libtool version
|
# Remove static and libtool version
|
||||||
rm -f "$b/%_lib/security"/*.{a,la} "$b/%_libdir"/*.la
|
rm -f $b%{_pam_moduledir}/*.{a,la} "$b/%_libdir"/*.la
|
||||||
#install the docs
|
#install the docs
|
||||||
mkdir -p "$b/%_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 "$b/%_docdir/%name/"
|
cp -a doc/bugs.txt doc/news.txt LICENSE* doc/faq.txt doc/todo.txt doc/options.txt "$b/%_docdir/%name/"
|
||||||
@ -146,7 +147,7 @@ fi
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%_docdir/%name
|
%_docdir/%name
|
||||||
/%_lib/security/pam_mount*.so
|
%{_pam_moduledir}/pam_mount*.so
|
||||||
%_sbindir/mount.*
|
%_sbindir/mount.*
|
||||||
%_sbindir/umount.*
|
%_sbindir/umount.*
|
||||||
%_sbindir/pmvarrun
|
%_sbindir/pmvarrun
|
||||||
|
Loading…
Reference in New Issue
Block a user