From 1c5ecdf5bde587ab024932b22c45b38818ecf939 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Thu, 13 Jan 2022 19:56:33 +0100 Subject: [PATCH] Fix the RPM condition for when the PAM plugin subpackage is not built -- Related: #2092370 --- mariadb.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mariadb.spec b/mariadb.spec index 507eed4..08c3ea6 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -873,6 +873,8 @@ fi -DPLUGIN_SPHINX=%{?with_sphinx:DYNAMIC}%{!?with_sphinx:NO} \ -DPLUGIN_CONNECT=%{?with_connect:DYNAMIC}%{!?with_connect:NO} \ -DPLUGIN_S3=%{?with_s3:DYNAMIC}%{!?with_s3:NO} \ + -DPLUGIN_AUTH_PAM=%{?with_pam:YES}%{!?with_pam:NO} \ + -DPLUGIN_AUTH_PAM_V1=%{?with_pam:DYNAMIC}%{!?with_pam:NO} \ -DPLUGIN_COLUMNSTORE=NO \ -DPLUGIN_CLIENT_ED25519=OFF \ -DPYTHON_SHEBANG=%{python_path} \ @@ -1073,7 +1075,9 @@ rm %{buildroot}%{logrotateddir}/mysql rm -r %{buildroot}%{_datadir}/%{pkg_name}/policy/apparmor # Buildroot does not have symlink /lib64 --> /usr/lib64 +%if %{with pam} mv %{buildroot}/%{_lib}/security %{buildroot}%{_libdir} +%endif # Add wsrep_sst_rsync_tunnel script install -p -m 0755 scripts/wsrep_sst_rsync_tunnel %{buildroot}%{_bindir}/wsrep_sst_rsync_tunnel