diff --git a/galera.spec b/galera.spec
index 9220237..094d18f 100644
--- a/galera.spec
+++ b/galera.spec
@@ -1,6 +1,6 @@
 Name:           galera
 Version:        25.3.25
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Synchronous multi-master wsrep provider (replication engine)
 
 License:        GPLv2
@@ -38,11 +38,15 @@ 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
+%{set_build_flags}
 
-scons-3 %{?_smp_mflags} strict_build_flags=0
+# FTBFS with the GLIBCXX_ASSERTIONS; #1546787
+CPPFLAGS=`echo $CPPFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
+CFLAGS=`echo $CFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
+CXXFLAGS=`echo $CXXFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
+export CPPFLAGS CFLAGS CXXFLAGS
+
+scons-3 %{?_smp_mflags} strict_build_flags=1
 
 
 %install
@@ -88,6 +92,9 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
 
 
 %changelog
+* 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