From 38d723b49603036d797e313e6278761c7ac45dbb Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 28 Apr 2021 01:35:25 +0200 Subject: [PATCH] Fix package Conflicts the Fedora package 'community-mysql' is named just 'mysql' on CentOS & RHEL Upstream commit: https://src.fedoraproject.org/rpms/mariadb-connector-c/c/813e4ea64fb6e7e96b4e4b7c6e119d53860e6114?branch=rawhide Resolves: #1954042 --- mariadb-connector-c.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 221a28f..92fbb75 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -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 - 3.1.12-3 +- Fix package conflicts + * Fri Apr 16 2021 Mohan Boddu - 3.1.12-2 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937