PR#18: Fix flatpak build - rpms/mariadb-connector-c

rpms / mariadb-connector-c

#18 Fix flatpak build

Merged 4 months ago by mschorm. Opened 4 months ago by yselkowitz.

rpms/ yselkowitz/mariadb-connector-c rawhide into rawhide

Fix flatpak build

Yaakov Selkowitz • 4 months ago

e95c4b7

mariadb-connector-c.spec

file modified

+3 -2

		`@@ -15,7 +15,7 @@`
		`Summary: The MariaDB Native Client library (C driver)`
		`License: LGPL-2.1-or-later`
		`Source: https://archive.mariadb.org/connector-c-%{version}/%{name}-%{version}-src.tar.gz`
		`- Source2: my.cnf`
		`+ Source2: my.cnf.in`
		`Source3: client.cnf`
		`Url: http://mariadb.org/`
		`# More information: https://mariadb.com/kb/en/mariadb/building-connectorc-from-source/`
		`@@ -143,6 +143,7 @@`

		`%cmake_build`

		`+ sed -e 's\|@SYSCONFDIR@\|%{_sysconfdir}\|' %{SOURCE2} > my.cnf`


		`%install`
		`@@ -158,7 +159,7 @@`
		`ln -s mariadb_version.h %{buildroot}%{_includedir}/mysql/mysql_version.h`

		`# Install config files`
		`- install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/my.cnf`
		`+ install -D -p -m 0644 my.cnf %{buildroot}%{_sysconfdir}/my.cnf`
		`install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf`

my.cnf.in ~~my.cnf~~

file renamed

+1 -1

		`@@ -7,5 +7,5 @@`
		`#`
		`# include all files from the config directory`
		`#`
		`- !includedir /etc/my.cnf.d`
		`+ !includedir @SYSCONFDIR@/my.cnf.d`

yselkowitz commented 4 months ago

mariadb-connector-c is not part of the flatpak runtime, and therefore is built in /app as a dependency of flatpaks which require it. Therefore, my.cnf must respect %_sysconfdir rather than use /etc.