Tweak systemd macro usage

Start building with GLIBCXX_ASSERTIONS again
Start building with strict_build_flags again
This commit is contained in:
Michal Schorm 2019-12-12 14:36:17 +01:00
parent 97705a488c
commit 89c4a20766

View File

@ -1,6 +1,6 @@
Name: galera Name: galera
Version: 26.4.3 Version: 26.4.3
Release: 1%{?dist} Release: 2%{?dist}
Summary: Synchronous multi-master wsrep provider (replication engine) Summary: Synchronous multi-master wsrep provider (replication engine)
License: GPLv2 License: GPLv2
@ -8,7 +8,7 @@ URL: http://galeracluster.com/
# Actually, the truth is, we do use galera source tarball provided by MariaDB on # Actually, the truth is, we do use galera source tarball provided by MariaDB on
# following URL (without macros): # 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 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 BuildRequires: boost-devel check-devel openssl-devel python3-scons systemd gcc-c++ asio-devel
Requires: nmap-ncat Requires: nmap-ncat
%{?systemd_requires}
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
%description %description
Galera is a fast synchronous multi-master wsrep provider (replication engine) Galera is a fast synchronous multi-master wsrep provider (replication engine)
@ -38,11 +34,7 @@ replication engine see http://www.codership.com.
%patch0 -p1 %patch0 -p1
%build %build
CPPFLAGS="%{optflags}" scons-3 %{?_smp_mflags} strict_build_flags=1
CPPFLAGS=`echo $CPPFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
export CPPFLAGS
scons-3 %{?_smp_mflags} strict_build_flags=0
%install %install
@ -88,6 +80,11 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
%changelog %changelog
* Thu Dec 12 2019 Michal Schorm <mschorm@redhat.com> - 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 <mschorm@redhat.com> - 26.4.3-1 * Tue Dec 03 2019 Michal Schorm <mschorm@redhat.com> - 26.4.3-1
- Rebase to 26.4.3 - Rebase to 26.4.3