From d1cec35de54a2df06ee7db785c3895a9dea56d4d Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 16 Jan 2019 13:23:01 +0100 Subject: [PATCH] Tweak handling of the mysql-selinux requirement --- community-mysql.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/community-mysql.spec b/community-mysql.spec index 5d7a6ed..be36866 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -10,6 +10,9 @@ # Set this to 1 to see which tests fail %global check_testsuite 0 +# Aditional SELinux rules +%global require_mysql_selinux 0 + # In f20+ use unversioned docdirs, otherwise the old versioned one %global _pkgdocdirname %{pkg_name}%{!?_pkgdocdir:-%{version}} %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{pkg_name}-%{version}} @@ -80,7 +83,7 @@ Name: community-mysql Version: 8.0.13 -Release: 2%{?with_debug:.debug}%{?dist} +Release: 3%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -287,6 +290,12 @@ Recommends: libcap # semanage Requires(post): policycoreutils-python-utils +# Aditional SELinux rules (common for MariaDB & MySQL) shipped in a separate package +# For cases, where we want to fix a SELinux issues in MySQL sooner than patched selinux-policy-targeted package is released +%if %require_mysql_selinux +Requires: (mysql-selinux if selinux-policy-targeted) +%endif + %if %{with mysql_names} Provides: mysql-server = %{sameevr} Provides: mysql-server%{?_isa} = %{sameevr} @@ -938,6 +947,9 @@ fi %endif %changelog +* Wed Jan 16 2019 Michal Schorm - 8.0.13-3 +- Tweak handling of the mysql-selinux requirement + * Mon Jan 14 2019 Björn Esser - 8.0.13-2 - Rebuilt for libcrypt.so.2 (#1666033)