Tweak handling of the mysql-selinux requirement

This commit is contained in:
Michal Schorm 2019-01-16 13:23:01 +01:00
parent 433427a241
commit d1cec35de5

View File

@ -10,6 +10,9 @@
# Set this to 1 to see which tests fail # Set this to 1 to see which tests fail
%global check_testsuite 0 %global check_testsuite 0
# Aditional SELinux rules
%global require_mysql_selinux 0
# In f20+ use unversioned docdirs, otherwise the old versioned one # In f20+ use unversioned docdirs, otherwise the old versioned one
%global _pkgdocdirname %{pkg_name}%{!?_pkgdocdir:-%{version}} %global _pkgdocdirname %{pkg_name}%{!?_pkgdocdir:-%{version}}
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{pkg_name}-%{version}} %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{pkg_name}-%{version}}
@ -80,7 +83,7 @@
Name: community-mysql Name: community-mysql
Version: 8.0.13 Version: 8.0.13
Release: 2%{?with_debug:.debug}%{?dist} Release: 3%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com URL: http://www.mysql.com
@ -287,6 +290,12 @@ Recommends: libcap
# semanage # semanage
Requires(post): policycoreutils-python-utils 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} %if %{with mysql_names}
Provides: mysql-server = %{sameevr} Provides: mysql-server = %{sameevr}
Provides: mysql-server%{?_isa} = %{sameevr} Provides: mysql-server%{?_isa} = %{sameevr}
@ -938,6 +947,9 @@ fi
%endif %endif
%changelog %changelog
* Wed Jan 16 2019 Michal Schorm <mschorm@redhat.com> - 8.0.13-3
- Tweak handling of the mysql-selinux requirement
* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 8.0.13-2 * Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 8.0.13-2
- Rebuilt for libcrypt.so.2 (#1666033) - Rebuilt for libcrypt.so.2 (#1666033)