Skip to content
Snippets Groups Projects
Commit 23ee4666 authored by Julian Brost's avatar Julian Brost :unicorn:
Browse files

Merge branch 'mariadb-connector-master' into 'master'

Use mariadb-connector-c for RHEL 8+

See merge request !31
parents 76f35850 66ce28ca
No related branches found
No related tags found
1 merge request!31Use mariadb-connector-c for RHEL 8+
Pipeline #21683 failed
...@@ -251,9 +251,13 @@ BuildRequires: libmysqlclient-devel ...@@ -251,9 +251,13 @@ BuildRequires: libmysqlclient-devel
BuildRequires: mysql-devel BuildRequires: mysql-devel
%endif %endif
%else
%if 0%{?rhel} >= 8
BuildRequires: mariadb-connector-c-devel
%else %else
BuildRequires: mysql-devel BuildRequires: mysql-devel
%endif #suse %endif #suse
%endif
Requires: %{name}-bin = %{version}-%{release} Requires: %{name}-bin = %{version}-%{release}
...@@ -643,6 +647,7 @@ getent passwd %{icinga_user} >/dev/null || %{_sbindir}/useradd -c "icinga" -s /s ...@@ -643,6 +647,7 @@ getent passwd %{icinga_user} >/dev/null || %{_sbindir}/useradd -c "icinga" -s /s
%endif %endif
%endif %endif
%if %{with mysql}
%post ido-mysql %post ido-mysql
if [ ${1:-0} -eq 1 ] && [ -e %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf ] if [ ${1:-0} -eq 1 ] && [ -e %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf ]
then then
...@@ -659,7 +664,9 @@ if [ "$1" = "0" ]; then ...@@ -659,7 +664,9 @@ if [ "$1" = "0" ]; then
fi fi
exit 0 exit 0
%endif
%if %{with pgsql}
%post ido-pgsql %post ido-pgsql
if [ ${1:-0} -eq 1 ] && [ -e %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf ] if [ ${1:-0} -eq 1 ] && [ -e %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf ]
then then
...@@ -676,6 +683,7 @@ if [ "$1" = "0" ]; then ...@@ -676,6 +683,7 @@ if [ "$1" = "0" ]; then
fi fi
exit 0 exit 0
%endif
%if 0%{?use_selinux} %if 0%{?use_selinux}
%post selinux %post selinux
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment