Import rpm: 29ac8f66af9ce546a5dc32afd7bee46243077ada
This commit is contained in:
James Antill
parent
f00450dbcd
commit
e760870a3d
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/galera-25.3.32.tar.gz
|
||||
SOURCES/galera-26.4.6.tar.gz
|
||||
|
||||
@ -2,8 +2,8 @@ Upstream PR:
|
||||
https://github.com/codership/galera/pull/512
|
||||
|
||||
diff -up galera-25.3.23/SConstruct.bak galera-25.3.23/SConstruct
|
||||
--- galera-25.3.26/SConstruct.bak 2018-07-13 15:14:49.059835554 +0200
|
||||
+++ galera-25.3.26/SConstruct 2018-07-13 15:19:07.717967794 +0200
|
||||
--- galera-25.3.23/SConstruct.bak 2018-07-13 15:14:49.059835554 +0200
|
||||
+++ galera-25.3.23/SConstruct 2018-07-13 15:19:07.717967794 +0200
|
||||
@@ -194,8 +194,8 @@ if link != 'default':
|
||||
env.Replace(LINK = link)
|
||||
|
||||
|
||||
89
galera.spec
89
galera.spec
@ -1,6 +1,6 @@
|
||||
Name: galera
|
||||
Version: 25.3.32
|
||||
Release: 1%{?dist}
|
||||
Version: 26.4.6
|
||||
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://archive.mariadb.org/mariadb-10.3.26/galera-25.3.31/src/galera-25.3.31.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,10 +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
|
||||
@ -50,14 +47,17 @@ replication engine see http://www.codership.com.
|
||||
# --warn=all
|
||||
# debug=0
|
||||
|
||||
%ifarch i686
|
||||
# Workaround for FTBFS on F33+
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1863592
|
||||
# Reported upstream:
|
||||
# https://github.com/codership/galera/issues/577
|
||||
# Update for 26.4.6: The strict_build_flags still FTBFS on armv7hl and i686
|
||||
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 8
|
||||
scons-3 %{?_smp_mflags} strict_build_flags=0
|
||||
%else
|
||||
scons-3 %{?_smp_mflags} strict_build_flags=1
|
||||
%endif
|
||||
|
||||
|
||||
|
||||
%install
|
||||
install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/garbd.service
|
||||
install -D -m 755 %{SOURCE2} %{buildroot}%{_sbindir}/garbd-wrapper
|
||||
@ -65,7 +65,6 @@ install -D -m 755 garb/garbd %{buildroot}%{_sbindir}/garbd
|
||||
install -D -m 755 libgalera_smm.so %{buildroot}%{_libdir}/galera/libgalera_smm.so
|
||||
install -D -m 644 garb/files/garb.cnf %{buildroot}%{_sysconfdir}/sysconfig/garb
|
||||
install -D -m 644 COPYING %{buildroot}%{_docdir}/galera/COPYING
|
||||
install -D -m 644 chromium/LICENSE %{buildroot}%{_docdir}/galera/LICENSE.chromium
|
||||
install -D -m 644 asio/LICENSE_1_0.txt %{buildroot}%{_docdir}/galera/LICENSE.asio
|
||||
install -D -m 644 scripts/packages/README %{buildroot}%{_docdir}/galera/README
|
||||
install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/README-MySQL
|
||||
@ -93,23 +92,73 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
|
||||
%{_libdir}/galera/libgalera_smm.so
|
||||
%doc %{_docdir}/galera/COPYING
|
||||
%doc %{_docdir}/galera/LICENSE.asio
|
||||
%doc %{_docdir}/galera/LICENSE.chromium
|
||||
%doc %{_docdir}/galera/README
|
||||
%doc %{_docdir}/galera/README-MySQL
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Mar 23 2021 Michal Schorm <mschorm@redhat.com> - 25.3.32-1
|
||||
- Rebase to 25.3.32
|
||||
* Mon Dec 07 2020 Honza Horak <hhorak@redhat.com> - 26.4.6-2
|
||||
- Do not use scrict flags on RHEL-8, it does not find check.h that way
|
||||
Related: #1855781
|
||||
|
||||
* Tue Nov 10 2020 Michal Schorm <mschorm@redhat.com> - 25.3.31-1
|
||||
- Rebase to 25.3.31
|
||||
Resolves: #1731289, #1856812
|
||||
* Wed Nov 04 2020 Michal Schorm <mschorm@redhat.com> - 26.4.6-1
|
||||
- Rebase to 26.4.6
|
||||
|
||||
* Thu Jul 18 2019 Michal Schorm <mschorm@redhat.com> - 25.3.26-1
|
||||
* Thu Sep 17 2020 Michal Schorm <mschorm@redhat.com> - 26.4.5-2
|
||||
- Extend the workaround also to ELN
|
||||
|
||||
* Wed Sep 16 2020 Michal Schorm <mschorm@redhat.com> - 26.4.5-1
|
||||
- Rebase to 26.4.5
|
||||
|
||||
* Wed Sep 16 2020 Michal Schorm <mschorm@redhat.com> - 26.4.4-5
|
||||
- Apply workaround for FTBFS on F33+
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 26.4.4-4
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 26.4.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jun 08 2020 Michal Schorm <mschorm@redhat.com> - 26.4.4-2
|
||||
- Second rebuild for Boost 1.73
|
||||
|
||||
* Fri Jun 05 2020 Michal Schorm <mschorm@redhat.com> - 26.4.4-1
|
||||
- Rebase to 26.4.4
|
||||
Resolves: rhbz#1546787
|
||||
|
||||
* Thu May 28 2020 Jonathan Wakely <jwakely@redhat.com> - 26.4.3-4
|
||||
- Rebuilt for Boost 1.73
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 26.4.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jan 18 2020 Michal Schorm <mschorm@redhat.com> - 26.4.3-2
|
||||
- Rebase to 26.4.3
|
||||
|
||||
* Wed Nov 06 2019 Michal Schorm <mschorm@redhat.com> - 25.3.28-1
|
||||
- Rebase to 25.3.28
|
||||
|
||||
* Thu Aug 01 2019 Michal Schorm <mschorm@redhat.com> - 25.3.26-3
|
||||
- Fix for #1735233 and #1737108
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 25.3.26-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Jul 19 2019 Michal Schorm <mschorm@redhat.com> - 25.3.26-1
|
||||
- Rebase to 25.3.26
|
||||
Resolves: #1687879
|
||||
Resolves: #1657220
|
||||
|
||||
* Fri Jul 19 2019 Michal Schorm <mschorm@redhat.com> - 25.3.25-4
|
||||
- Use macro for setting up the compiler flags
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 25.3.25-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Jan 29 2019 Jonathan Wakely <jwakely@redhat.com> - 25.3.25-2
|
||||
- Rebuilt for Boost 1.69
|
||||
|
||||
* Tue Jan 01 2019 Michal Schorm <mschorm@redhat.com> - 25.3.25-1
|
||||
- Rebase to 25.3.25
|
||||
|
||||
* Mon Jul 16 2018 Honza Horak <hhorak@redhat.com> - 25.3.23-5
|
||||
- Require asio also on rhel
|
||||
|
||||
Loading…
Reference in New Issue
Block a user