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
This commit is contained in:
Yaakov Selkowitz 2024-04-08 23:18:44 -04:00 committed by Michal Schorm
parent fcab24beb2
commit 60e7da0fac

View File

@ -136,7 +136,7 @@
Name: %{majorname}%{majorversion}
Version: %{package_version}
Release: 4%{?with_debug:.debug}%{?dist}
Release: 5%{?with_debug:.debug}%{?dist}
Epoch: 3
Summary: A very fast and robust SQL database server
@ -373,7 +373,11 @@ package itself.
%package -n %{pkgname}-common
Summary: The shared files required by server and client
BuildArch: noarch
Requires: %{_sysconfdir}/my.cnf
%if 0%{?flatpak}
Requires: mariadb-connector-c-config
%else
Requires: /etc/my.cnf
%endif
# Only conflicts, provides would add %%{_isa} provides for noarch,
# which is not wanted
@ -1709,6 +1713,9 @@ fi
%endif
%changelog
* Tue Apr 09 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 3:10.11.6-5
- Fix my.cnf dependency
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3:10.11.6-4
- Bump release for June 2024 mass rebuild