Notification time stamped 2021-01-31 23:41:45 UTC
From d282b9922b37b15a291ec911a03b3033917444f3 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm(a)redhat.com>
Date: Jan 31 2021 23:40:49 +0000
Subject: Allow to run the test-suite in parallel when more versions are built
---
diff --git a/mariadb.spec b/mariadb.spec
index 567a95b..815d41a 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1191,8 +1191,10 @@ rm %{buildroot}%{_mandir}/man1/mbstream.1*
%if %runselftest
# hack to let 32- and 64-bit tests run concurrently on same build machine
export MTR_PARALLEL=1
-# builds might happen at the same host, avoid collision
-export MTR_BUILD_THREAD=%{__isa_bits}
+# Builds might happen at the same host, avoid collision
+# The port used is calculated as 10 * MTR_BUILD_THREAD + 10000
+# The resulting port must be between 5000 and 32767
+export MTR_BUILD_THREAD=$(( $(date +%s) % 2200 ))
# The cmake build scripts don't provide any simple way to control the
# options for mysql-test-run, so ignore the make target and just call it
https://src.fedoraproject.org/rpms/mariadb/c/d282b9922b37b15a291ec911a03b30…
Notification time stamped 2021-01-31 23:39:05 UTC
From 7c5259855284cd8e6f4f18e9939c4e65b4869ae8 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm(a)redhat.com>
Date: Jan 31 2021 23:38:04 +0000
Subject: For compatibility with upstream RPMs, create symlinks to "mysql*" named systemd services
---
diff --git a/mariadb.spec b/mariadb.spec
index 9ac2158..567a95b 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -154,7 +154,7 @@
Name: mariadb
Version: 10.5.8
-Release: 4%{?with_debug:.debug}%{?dist}
+Release: 5%{?with_debug:.debug}%{?dist}
Epoch: 3
Summary: A very fast and robust SQL database server
@@ -1033,7 +1033,11 @@ install -p -m 0644 %{SOURCE71} %{basename:%{SOURCE71}}
# We don't use this location of service files
rm %{buildroot}%{_datadir}/%{pkg_name}/systemd/{mysql,mysqld}.service
# These may come handy in a future, but right now we use our own services
-rm %{buildroot}/usr/lib/systemd/system/{mysql,mysqld}.service
+rm %{buildroot}%{_unitdir}/{mysql,mysqld}.service
+
+# For compatibility with upstream RPMs, create symlinks to "mysql*" named systemd services
+ln -s %{_unitdir}/mariadb.service %{buildroot}%{_unitdir}/mysql.service
+ln -s %{_unitdir}/mariadb.service %{buildroot}%{_unitdir}/mysqld.service
# install galera config file
%if %{with galera}
@@ -1492,6 +1496,8 @@ fi
%endif
%{_unitdir}/%{daemon_name}*
+%{_unitdir}/mysql.service
+%{_unitdir}/mysqld.service
%{?with_tokudb:%exclude %{_unitdir}/mariadb.service.d/tokudb.conf}
%{_libexecdir}/mysql-prepare-db-dir
@@ -1629,6 +1635,9 @@ fi
%endif
%changelog
+* Sun Jan 31 2021 Michal Schorm <hhorak(a)redhat.com> - 3:10.5.8-5
+- For compatibility with upstream RPMs, create symlinks to "mysql*" named systemd services
+
* Thu Jan 28 2021 Honza Horak <hhorak(a)redhat.com> - 3:10.5.8-4
- For compatibility with upstream RPMs, create mysqld symlink in sbin
https://src.fedoraproject.org/rpms/mariadb/c/7c5259855284cd8e6f4f18e9939c4e…