diff --git a/pam.spec b/pam.spec index 0f7ff4c..2eca017 100644 --- a/pam.spec +++ b/pam.spec @@ -114,22 +114,22 @@ autoreconf -i %build %configure \ - --libdir=%{_pam_libdir} \ - --includedir=%{_includedir}/security \ - --disable-rpath \ - --disable-static \ - --disable-prelude \ - --enable-audit \ - --enable-openssl \ - --enable-selinux \ - --enable-vendordir=%{_datadir} + --libdir=%{_pam_libdir} \ + --includedir=%{_includedir}/security \ + --disable-rpath \ + --disable-static \ + --disable-prelude \ + --enable-audit \ + --enable-openssl \ + --enable-selinux \ + --enable-vendordir=%{_datadir} %make_build -C po update-gmo %make_build %install mkdir -p doc/txts for readme in modules/pam_*/README ; do - cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'` + cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'` done # Install the macros file @@ -170,23 +170,23 @@ ln -sf system-auth.5 %{buildroot}%{_mandir}/man5/smartcard-auth.5 for phase in auth acct passwd session ; do - ln -sf pam_unix.so %{buildroot}%{_pam_moduledir}/pam_unix_${phase}.so + ln -sf pam_unix.so %{buildroot}%{_pam_moduledir}/pam_unix_${phase}.so done # Remove .la files and make new .so links -- this depends on the value # of _libdir not changing, and *not* being /usr/lib. for lib in libpam libpamc libpam_misc ; do -rm -f %{buildroot}%{_pam_libdir}/${lib}.la + rm -f %{buildroot}%{_pam_libdir}/${lib}.la done rm -f %{buildroot}%{_pam_moduledir}/*.la %if "%{_pam_libdir}" != "%{_libdir}" install -d -m 755 %{buildroot}%{_libdir} for lib in libpam libpamc libpam_misc ; do -pushd %{buildroot}%{_libdir} -ln -sf %{_pam_libdir}/${lib}.so.*.* ${lib}.so -popd -rm -f %{buildroot}%{_pam_libdir}/${lib}.so + pushd %{buildroot}%{_libdir} + ln -sf %{_pam_libdir}/${lib}.so.*.* ${lib}.so + popd + rm -f %{buildroot}%{_pam_libdir}/${lib}.so done %endif @@ -217,13 +217,13 @@ find %{buildroot}%{_pkgdocdir} -type f | xargs chmod 644 # Make sure every module subdirectory gave us a module. Yes, this is hackish. for dir in modules/pam_* ; do if [ -d ${dir} ] ; then - [ ${dir} = "modules/pam_selinux" ] && continue - [ ${dir} = "modules/pam_sepermit" ] && continue - [ ${dir} = "modules/pam_tty_audit" ] && continue - if ! ls -1 %{buildroot}%{_pam_moduledir}/`basename ${dir}`*.so ; then - echo ERROR `basename ${dir}` did not build a module. - exit 1 - fi + [ ${dir} = "modules/pam_selinux" ] && continue + [ ${dir} = "modules/pam_sepermit" ] && continue + [ ${dir} = "modules/pam_tty_audit" ] && continue + if ! ls -1 %{buildroot}%{_pam_moduledir}/`basename ${dir}`*.so ; then + echo ERROR `basename ${dir}` did not build a module. + exit 1 + fi fi done @@ -231,11 +231,11 @@ done # installed can actually be loaded by a minimal PAM-aware application. /sbin/ldconfig -n %{buildroot}%{_pam_libdir} for module in %{buildroot}%{_pam_moduledir}/pam*.so ; do - if ! env LD_LIBRARY_PATH=%{buildroot}%{_pam_libdir} \ - %{SOURCE11} -ldl -lpam -L%{buildroot}%{_libdir} ${module} ; then - echo ERROR module: ${module} cannot be loaded. - exit 1 - fi + if ! env LD_LIBRARY_PATH=%{buildroot}%{_pam_libdir} \ + %{SOURCE11} -ldl -lpam -L%{buildroot}%{_libdir} ${module} ; then + echo ERROR module: ${module} cannot be loaded. + exit 1 + fi done %files -f Linux-PAM.lang @@ -380,6 +380,7 @@ exit 0 - Rename docs sub-package to doc - Replace $RPM_BUILD_ROOT with %%{buildroot} - Move documentation to %%{_pkgdocdir} +- Constantly use spaces for indentation * Thu Sep 23 2021 Björn Esser - 1.5.2-5 - Rebase to pam-redhat-1.1.5