diff --git a/build.inc b/build.inc
index 51e5e21..0c06e4e 100644
--- a/build.inc
+++ b/build.inc
@@ -21,10 +21,10 @@ export CXXFLAGS="$CFLAGS -felide-constructors"
         -DDEFAULT_CHARSET=utf8  -DDEFAULT_COLLATION=utf8_general_ci  \
         -DWITH_INNOBASE_STORAGE_ENGINE=1                             \
         -DWITH_PERFSCHEMA_STORAGE_ENGINE=1                           \
-%if %{with oqgraph}
+%if 0%{with_oqgraph} > 0
         -DWITH_OQGRAPH_STORAGE_ENGINE=1                              \
 %endif
-%if %{with cassandra}
+%if 0%{with_cassandra} > 0
         -DWITH_CASSANDRA_STORAGE_ENGINE=1                            \
 %endif
         -DWITH_XTRADB_STORAGE_ENGINE=1                               \
diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2
index 2cbfd50..d34b51f 100644
--- a/configuration-tweaks.tar.bz2
+++ b/configuration-tweaks.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aaffd991c9c98217463e452d3cb2eba69dd40465831119c57c892f4ec08e0d8b
-size 222
+oid sha256:4aa62499d5bcff38f7c077245fc896160539eef671aa1588bd7d65defd6bbe78
+size 219
diff --git a/mariadb.spec b/mariadb.spec
index 00536b8..d157e75 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -26,10 +26,14 @@
 %define _rundir %{_localstatedir}/run
 %endif
 
-%if %{use_extra_provides} > 0
-%bcond_with     jemalloc
-%bcond_with     oqgraph
-%bcond_with     cassandra
+%if 0 > 0
+%define_with_jemalloc 1
+%define_with_oqgraph 1
+%define_with_cassandra 1
+%else
+%define_with_jemalloc 0
+%define_with_oqgraph 0
+%define_with_cassandra 0
 %endif
 
 Name:           mariadb
@@ -56,23 +60,23 @@ Source15:       rc.mysql.sysvinit
 Source16:       rc.mysql.systemd
 Source17:       mysql.service
 BuildRequires:  bison
-%if %{with oqgraph} || %{with cassandra}
+%if 0%{with_oqgraph} > 0 || 0%{with_cassandra} > 0
 BuildRequires:  boost-devel
 %endif
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-%if %{with jemalloc}
+%if 0%{with_jemalloc} > 0
 BuildRequires:  jemalloc-devel
 %endif
-%if %{with oqgraph}
+%if 0%{with_oqgraph} > 0
 BuildRequires:  judy-devel
 %endif
 BuildRequires:  libaio-devel
 BuildRequires:  libbz2-devel
 BuildRequires:  libedit-devel
 BuildRequires:  libevent-devel
-%if %{with cassandra}
+%if 0%{with_cassandra} > 0
 BuildRequires:  libthrift-devel
 %endif
 BuildRequires:  libtool