diff --git a/community-mysql.spec b/community-mysql.spec
index 16adb58..e5749f2 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -568,13 +568,13 @@ install -p -m 0644 %{SOURCE7} %{_vpath_srcdir}/%{basename:%{SOURCE7}}
 # Install the list of skipped tests to be available for user runs
 install -p -m 0644 %{_vpath_srcdir}/mysql-test/%{skiplist} %{buildroot}%{_datadir}/mysql-test
 
-%if %{without clibrary}
+%if ! %{with clibrary}
 unlink %{buildroot}%{_libdir}/mysql/libmysqlclient.so
 rm -r %{buildroot}%{_libdir}/mysql/libmysqlclient*.so.*
 rm -r %{buildroot}%{_sysconfdir}/ld.so.conf.d
 %endif
 
-%if %{without devel}
+%if ! %{with devel}
 rm %{buildroot}%{_bindir}/mysql_config*
 rm -r %{buildroot}%{_includedir}/mysql
 rm %{buildroot}%{_datadir}/aclocal/mysql.m4
@@ -583,7 +583,7 @@ rm %{buildroot}%{_libdir}/mysql/libmysqlclient*.so
 rm %{buildroot}%{_mandir}/man1/mysql_config.1*
 %endif
 
-%if %{without client}
+%if ! %{with client}
 rm %{buildroot}%{_bindir}/{mysql,mysql_config_editor,\
 mysql_plugin,mysqladmin,mysqlbinlog,\
 mysqlcheck,mysqldump,mysqlpump,mysqlimport,mysqlshow,mysqlslap,my_print_defaults}
@@ -598,18 +598,18 @@ mkdir -p %{buildroot}%{_sysconfdir}/my.cnf.d
 #rm %{buildroot}%{_sysconfdir}/my.cnf
 %endif
 
-%if %{without common}
+%if ! %{with common}
 rm -r %{buildroot}%{_datadir}/%{pkg_name}/charsets
 %endif
 
-%if %{without errmsg}
+%if ! %{with errmsg}
 rm %{buildroot}%{_datadir}/%{pkg_name}/{messages_to_error_log.txt,messages_to_clients.txt}
 rm -r %{buildroot}%{_datadir}/%{pkg_name}/{english,bulgarian,czech,danish,dutch,estonian,\
 french,german,greek,hungarian,italian,japanese,korean,norwegian,norwegian-ny,\
 polish,portuguese,romanian,russian,serbian,slovak,spanish,swedish,ukrainian}
 %endif
 
-%if %{without test}
+%if ! %{with test}
 rm %{buildroot}%{_bindir}/{mysql_client_test,mysqlxtest,mysqltest_safe_process,zlib_decompress}
 rm -r %{buildroot}%{_datadir}/mysql-test
 %endif
@@ -791,7 +791,7 @@ fi
 
 %{_libdir}/mysql/INFO_SRC
 %{_libdir}/mysql/INFO_BIN
-%if %{without common}
+%if ! %{with common}
 %dir %{_datadir}/%{pkg_name}
 %endif