Accepting request 922117 from network:cluster

- moved pam module from /lib64 to /usr/lib64 which fixes boo#1191095 
  via the macro %_pam_moduledir

OBS-URL: https://build.opensuse.org/request/show/922117
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slurm?expand=0&rev=65
This commit is contained in:
Dominique Leuenberger 2021-09-29 18:18:55 +00:00 committed by Git OBS Bridge
commit ad0b52bd59
2 changed files with 15 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Sep 28 15:53:38 UTC 2021 - Christian Goll <cgoll@suse.com>
- moved pam module from /lib64 to /usr/lib64 which fixes boo#1191095
via the macro %_pam_moduledir
-------------------------------------------------------------------
Fri Sep 17 07:22:44 UTC 2021 - Christian Goll <cgoll@suse.com>

View File

@ -122,6 +122,10 @@ ExclusiveArch: do_not_build
%define libslurm libslurm%{so_version}
%{!?_rundir:%define _rundir /var/run}
%if !0%{?_pam_moduledir:1}
%define _pam_moduledir /%_lib
%endif
Name: %{pname}%{?upgrade:%{_ver}}
Version: %{ver}
Release: 0
@ -560,6 +564,7 @@ autoreconf
--without-rpath \
--without-datawarp \
--with-shared-libslurm \
--with-pam_dir=%_pam_moduledir \
%{?with_pmix:--with-pmix=/usr/} \
%if 0%{?build_slurmrestd}
--enable-slurmrestd \
@ -613,6 +618,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{pname}/plugstack.conf.d
cp contribs/pam_slurm_adopt/README ../README.pam_slurm_adopt
cp contribs/pam/README ../README.pam_slurm
# remove static pam libs
rm -v %{buildroot}%{_pam_moduledir}/*la
# change slurm.conf for our needs
head -n -2 %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf.example | grep -v ReturnToService > %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf
sed -i 's#\(StateSaveLocation=\).*#\1%_localstatedir/lib/slurm#' %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf
@ -1179,8 +1186,8 @@ exit 0
%files pam_slurm
%{?comp_at}
%doc ../README.pam_slurm ../README.pam_slurm_adopt
/%_lib/security/pam_slurm.so
/%_lib/security/pam_slurm_adopt.so
%{_pam_moduledir}/pam_slurm.so
%{_pam_moduledir}/pam_slurm_adopt.so
%if 0%{?build_slurmrestd}
%files rest