Fix package Conflicts the Fedora package 'community-mysql' is named just 'mysql' on CentOS & RHEL

Upstream commit:
  813e4ea64f

Resolves: #1954042
This commit is contained in:
Michal Schorm 2021-04-28 01:35:25 +02:00
parent 8521c2b32d
commit 38d723b496

View File

@ -15,7 +15,7 @@
Name: mariadb-connector-c
Version: 3.1.12
Release: 2%{?with_debug:.debug}%{?dist}
Release: 3%{?with_debug:.debug}%{?dist}
Summary: The MariaDB Native Client library (C driver)
License: LGPLv2+
Source: https://downloads.mariadb.org/interstitial/connector-c-%{version}/%{name}-%{version}-src.tar.gz
@ -46,7 +46,7 @@ Summary: Development files for mariadb-connector-c
Requires: %{name} = %{version}-%{release}
Requires: openssl-devel zlib-devel
BuildRequires: multilib-rpm-config
Conflicts: community-mysql-devel
Conflicts: %{?fedora:community-}mysql-devel
%description devel
Development files for mariadb-connector-c.
@ -234,6 +234,9 @@ popd
# Need to ensure, that the testsuite will also run properly on 'fedpkg local' buid, not damaging the host machine
%changelog
* Wed Apr 28 2021 Michal Schorm <mschorm@redhat.com> - 3.1.12-3
- Fix package conflicts
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.12-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937