From 36961955ec8a19c58fff9700568d374d1e5e42ba Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 9 May 2024 21:31:48 +0200 Subject: [PATCH] - bcond for building as default MySQL (for now 8.0 is default) --- mysql.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mysql.spec b/mysql.spec index e85f7a4..2e3fd45 100644 --- a/mysql.spec +++ b/mysql.spec @@ -12,6 +12,7 @@ %bcond_with tests # run test suite %bcond_with ndb # NDB is now a separate product, this here is broken, so disable it %bcond_without ldap # LDAP auth support (requires MIT Kerberos) +%bcond_with default # default version of MySQL (with -common and -devel) %define mysqlversion 8.4 %define mysqlpriority 84 @@ -255,7 +256,7 @@ MySQL - wspólne pliki i katalogi. Summary: Common directories for MysSQL %{mysqlversion} Summary(pl.UTF-8): Wspólne pliki i katalogi dla MySQL %{mysqlversion} Group: Applicataion/Databases -Requires: mysql-common >= %{version}-%{release} +Requires: mysql-common >= 8.0.0 %description dirs Common directories for MysSQL %{mysqlversion} @@ -1097,6 +1098,7 @@ fi %defattr(644,root,root,755) %{_datadir}/mysql/%{mysqlversion}/lang/charsets +%if %{with default} %files -n mysql-common %defattr(644,root,root,755) %attr(751,root,root) %dir %{_sysconfdir}/mysql @@ -1109,6 +1111,7 @@ fi %attr(751,root,root) %dir /var/log/archive/mysql %attr(751,root,root) %dir /var/log/mysqlrouter %attr(751,root,root) %dir /var/log/archive/mysqlrouter +%endif %files dirs %defattr(644,root,root,755) @@ -1169,6 +1172,7 @@ fi %attr(755,root,root) %ghost %{_libdir}/libndbclient.so.3 %endif +%if %{with default} %files -n mysql-devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/mysql_config @@ -1188,6 +1192,7 @@ fi %if %{with ndb} %{_libdir}/libndbclient.a %endif +%endif %if %{with ndb} %files ndb -- 2.46.0