Fix my.cnf dependency

Installation path macros are not allowed in file dependencies.
Starting with F40, these break flatpak builds entirely because
dnf5 only recognizes file deps in /etc, /usr/bin, and /usr/sbin,
not /app/etc.  At this point, mariadb-connector-c-config is the
sole provider of my.cnf.

https://docs.fedoraproject.org/en-US/packaging-guidelines/#_file_and_directory_dependencies

--

Based on commit 45b40b2 in rpms/mariadb10.11 authored by Yaakov Selkowitz on Apr 8 2024
45b40b2e9c
This commit is contained in:
Michal Schorm 2024-04-17 01:57:15 +02:00
parent 164e60d4fa
commit 430b276312

View File

@ -84,7 +84,7 @@
Name: %{majorname}%{majorversion}
Version: %{package_version}
Release: 4%{?with_debug:.debug}%{?dist}
Release: 5%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com
@ -302,7 +302,11 @@ package itself.
%package -n %{pkgname}-common
Summary: The shared files required for MySQL server and client
BuildArch: noarch
%if 0%{?flatpak}
Requires: mariadb-connector-c-config
%else
Requires: %{_sysconfdir}/my.cnf
%endif
%{?with_provides_community_mysql:Provides: community-mysql-common = %community_mysql_version}
%{?with_obsoletes_community_mysql:Obsoletes: community-mysql-common <= %obsolete_community_mysql_version}
@ -338,8 +342,12 @@ Summary: The MySQL server and related files
Requires: %{pkgname}%{?_isa} = %{sameevr}
Requires: %{pkgname}-common = %{sameevr}
%if 0%{?flatpak}
Requires: mariadb-connector-c-config
%else
Requires: %{_sysconfdir}/my.cnf
Requires: %{_sysconfdir}/my.cnf.d
%endif
Requires: %{pkgname}-errmsg = %{sameevr}
%{?mecab:Requires: mecab-ipadic}
Requires: coreutils
@ -1043,6 +1051,9 @@ fi
%endif
%changelog
* Tue Apr 16 2024 Michal Schorm <mschorm@redhat.com> - 8.0.36-5
- Fix my.cnf dependency for Flatpak builds
* Mon Feb 19 2024 Honza Horak <hhorak@redhat.com> - 8.0.36-4
- Do not provide community-mysql* symbols if alternative