From d3badbee4bef85128e4d8849f2a9fb433ac4d9a5 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 13 Mar 2019 10:11:01 +0100 Subject: [PATCH 1/5] Update to 26.4.0 --- .gitignore | 1 + galera.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f1de323..e9cc78e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /galera-25.3.22.tar.gz /galera-25.3.23.tar.gz /galera-25.3.25.tar.gz +/galera-26.4.0.tar.gz diff --git a/galera.spec b/galera.spec index fff46bd..0bccaf8 100644 --- a/galera.spec +++ b/galera.spec @@ -1,6 +1,6 @@ Name: galera -Version: 25.3.25 -Release: 3%{?dist} +Version: 26.4.0 +Release: 1%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) License: GPLv2 @@ -8,7 +8,7 @@ URL: http://galeracluster.com/ # Actually, the truth is, we do use galera source tarball provided by MariaDB on # following URL (without macros): -# https://mirror.vpsfree.cz/mariadb/mariadb-10.2.13/galera-25.3.23/src/galera-25.3.23.tar.gz +# https://mirror.vpsfree.cz/mariadb/mariadb-10.4.3/galera-26.4.0/src/galera-26.4.0.tar.gz Source0: http://releases.galeracluster.com/source/%{name}-%{version}.tar.gz @@ -88,13 +88,16 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE %changelog +* Wed Mar 13 2019 Michal Schorm - 26.4.0-1 +- Rebase to 26.4.0 + * Thu Jan 31 2019 Fedora Release Engineering - 25.3.25-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild * Tue Jan 29 2019 Jonathan Wakely - 25.3.25-2 - Rebuilt for Boost 1.69 -* Thu Jan 01 2019 Michal Schorm - 25.3.25-1 +* Tue Jan 01 2019 Michal Schorm - 25.3.25-1 - Rebase to 25.3.25 * Mon Jul 16 2018 Honza Horak - 25.3.23-5 diff --git a/sources b/sources index 37d9fae..84aa478 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (galera-25.3.25.tar.gz) = 231f58c52437a98440bfa6d6ba05a87fbd6353fe67d4380fff7c15f759a5bd11732d30b8d58d72e0641fd2df180fcec10f88fa8282a8ca1affa3c762644b471e +SHA512 (galera-26.4.0.tar.gz) = 56284e84fa289206c745c0fdb48141f150efd96cf02c97daa36c589d0c17c8493d613e198bbf3521916739bbca8fd724385966439a38d74a7fd356f4ef3cc25f From 0922ee7337a414de8ffa62a4b835d557161597c2 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 13 Mar 2019 10:12:48 +0100 Subject: [PATCH 2/5] Update to 26.4.1 --- .gitignore | 1 + galera.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e9cc78e..a2db6de 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /galera-25.3.23.tar.gz /galera-25.3.25.tar.gz /galera-26.4.0.tar.gz +/galera-26.4.1.tar.gz diff --git a/galera.spec b/galera.spec index 0bccaf8..4cbc9f1 100644 --- a/galera.spec +++ b/galera.spec @@ -1,5 +1,5 @@ Name: galera -Version: 26.4.0 +Version: 26.4.1 Release: 1%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) @@ -88,6 +88,9 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE %changelog +* Wed Mar 13 2019 Michal Schorm - 26.4.1-1 +- Rebase to 26.4.1 + * Wed Mar 13 2019 Michal Schorm - 26.4.0-1 - Rebase to 26.4.0 diff --git a/sources b/sources index 84aa478..73665db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (galera-26.4.0.tar.gz) = 56284e84fa289206c745c0fdb48141f150efd96cf02c97daa36c589d0c17c8493d613e198bbf3521916739bbca8fd724385966439a38d74a7fd356f4ef3cc25f +SHA512 (galera-26.4.1.tar.gz) = 7d071f71aa0f16d95bb1e4142b95e46d0acf067b170ae38bc8000626e43837f8071c4acb4cd18694a534ce3b34367cf5c1d2ae375e8ed598bb140882f70698f6 From 8a1c3c7f34b0acfe595b645af4f6abeed95af5b9 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 4 Jun 2019 14:52:11 +0200 Subject: [PATCH 3/5] Update to 26.4.2 --- .gitignore | 1 + galera.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a2db6de..39c14bc 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /galera-25.3.25.tar.gz /galera-26.4.0.tar.gz /galera-26.4.1.tar.gz +/galera-26.4.2.tar.gz diff --git a/galera.spec b/galera.spec index 4cbc9f1..d74ba70 100644 --- a/galera.spec +++ b/galera.spec @@ -1,5 +1,5 @@ Name: galera -Version: 26.4.1 +Version: 26.4.2 Release: 1%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) @@ -88,6 +88,9 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE %changelog +* Tue Jun 04 2019 Michal Schorm - 26.4.2-1 +- Rebase to 26.4.2 + * Wed Mar 13 2019 Michal Schorm - 26.4.1-1 - Rebase to 26.4.1 diff --git a/sources b/sources index 73665db..51c5c68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (galera-26.4.1.tar.gz) = 7d071f71aa0f16d95bb1e4142b95e46d0acf067b170ae38bc8000626e43837f8071c4acb4cd18694a534ce3b34367cf5c1d2ae375e8ed598bb140882f70698f6 +SHA512 (galera-26.4.2.tar.gz) = 6c500dbcdc9156421c628c842a00985b3e7c440ad2facbd893f98c846426bf0607ca28152fef99a587146cefb376883ef083d498562d96fcedecf4935a3d466f From 97705a488cfb7cd8035f5c3e6accb2fb3600d44b Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 3 Dec 2019 14:52:24 +0100 Subject: [PATCH 4/5] Rebase to 26.4.3 --- .gitignore | 1 + galera.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 39c14bc..cb3fec6 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /galera-26.4.0.tar.gz /galera-26.4.1.tar.gz /galera-26.4.2.tar.gz +/galera-26.4.3.tar.gz diff --git a/galera.spec b/galera.spec index d74ba70..e0c6df1 100644 --- a/galera.spec +++ b/galera.spec @@ -1,5 +1,5 @@ Name: galera -Version: 26.4.2 +Version: 26.4.3 Release: 1%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) @@ -88,6 +88,9 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE %changelog +* Tue Dec 03 2019 Michal Schorm - 26.4.3-1 +- Rebase to 26.4.3 + * Tue Jun 04 2019 Michal Schorm - 26.4.2-1 - Rebase to 26.4.2 diff --git a/sources b/sources index 51c5c68..5f749be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (galera-26.4.2.tar.gz) = 6c500dbcdc9156421c628c842a00985b3e7c440ad2facbd893f98c846426bf0607ca28152fef99a587146cefb376883ef083d498562d96fcedecf4935a3d466f +SHA512 (galera-26.4.3.tar.gz) = 857c6b1965871a5801d3cd7396fec8259e0b72a397b5fb92e63f374531fdb03dbecd5d5ebfdf2f0dc388d87c0ae25b357d02581c8d5889803d04c0a2f2583b52 From 89c4a2076648acc8d651af044f40614e9f8e1413 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Thu, 12 Dec 2019 14:36:17 +0100 Subject: [PATCH 5/5] Tweak systemd macro usage Start building with GLIBCXX_ASSERTIONS again Start building with strict_build_flags again --- galera.spec | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/galera.spec b/galera.spec index e0c6df1..00a6563 100644 --- a/galera.spec +++ b/galera.spec @@ -1,6 +1,6 @@ Name: galera Version: 26.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) License: GPLv2 @@ -8,7 +8,7 @@ URL: http://galeracluster.com/ # Actually, the truth is, we do use galera source tarball provided by MariaDB on # following URL (without macros): -# https://mirror.vpsfree.cz/mariadb/mariadb-10.4.3/galera-26.4.0/src/galera-26.4.0.tar.gz +# https://mirror.vpsfree.cz/mariadb/mariadb-10.4.11/galera-26.4.3/src/galera-26.4.3.tar.gz Source0: http://releases.galeracluster.com/source/%{name}-%{version}.tar.gz @@ -20,11 +20,7 @@ Patch0: galera-python3.patch BuildRequires: boost-devel check-devel openssl-devel python3-scons systemd gcc-c++ asio-devel Requires: nmap-ncat - -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd - +%{?systemd_requires} %description Galera is a fast synchronous multi-master wsrep provider (replication engine) @@ -38,11 +34,7 @@ replication engine see http://www.codership.com. %patch0 -p1 %build -CPPFLAGS="%{optflags}" -CPPFLAGS=`echo $CPPFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" ` -export CPPFLAGS - -scons-3 %{?_smp_mflags} strict_build_flags=0 +scons-3 %{?_smp_mflags} strict_build_flags=1 %install @@ -88,6 +80,11 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE %changelog +* Thu Dec 12 2019 Michal Schorm - 26.4.3-2 +- Tweak systemd macro usage +- Start building with GLIBCXX_ASSERTIONS again +- Start building with strict_build_flags again + * Tue Dec 03 2019 Michal Schorm - 26.4.3-1 - Rebase to 26.4.3