diff --git a/nufw.spec b/nufw.spec index 2745831..d65744f 100644 --- a/nufw.spec +++ b/nufw.spec @@ -95,6 +95,7 @@ in NuFW. Summary: Nufw client using pam credentials Group: System Environment/Libraries BuildRequires: chrpath +Conflicts: filesystem < 3 %description -n pam_nufw pam_nufw is a PAM module able to integrate with the PAM stack. @@ -186,8 +187,8 @@ popd # fix postgresql name perl -pi -e "s|postgresql|pgsql|" ./src/nuauth/modules/log_pgsql/Makefile* -perl -pi -e 's|^(modulesdir\s*=\s*/)lib|$1%_lib|' ./src/clients/pam_nufw/Makefile* -perl -pi -e 's|(\@modulesdir\s*=\s*/)lib|$1%_lib|' ./src/clients/pam_nufw/Makefile* +perl -pi -e 's|^(modulesdir\s*=\s*)/lib|$1%_libdir|' ./src/clients/pam_nufw/Makefile* +perl -pi -e 's|(\@modulesdir\s*=\s*)/lib|$1%_libdir|' ./src/clients/pam_nufw/Makefile* # fix nuauth-utils build perl -pi -e 's|\$\(prefix\)|\%\{buildroot\}|' ./scripts/nuauth_command/Makefile* @@ -225,7 +226,7 @@ mkdir -p %{buildroot}/%{_localstatedir}/lib/nuauth mkdir -p %{buildroot}/%{_localstatedir}/run/nuauth # clean useless files rm -f %{buildroot}/%{_libdir}/nuauth/modules/*.{a,la} -rm -f %{buildroot}/%{_lib}/security/*{a,la} +rm -f %{buildroot}/%{_libdir}/security/*{a,la} rm -f %{buildroot}/%{_libdir}/libnobuffer* mkdir -p %{buildroot}/%_initrddir/ @@ -344,7 +345,7 @@ fi %files -n pam_nufw %defattr(-, root, root, -) %doc doc/README.pam_nufw -/%{_lib}/security/pam_nufw.so +%{_libdir}/security/pam_nufw.so %files -n nuauth-auth-ldap %defattr(-, root, root, -)