switch to new conditional builds macros (bcond_on_ -> _with_/bcond_off_ -> _without_...

Changed files:
    mysql.spec -> 1.89

diff --git a/mysql.spec b/mysql.spec
index 050d96572a9c1e4e5eff7ce7065fb979f4c3104f..8001fc84535e64de0416336253c0c1e0ad0e1f91 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -259,8 +259,8 @@ autoconf
 CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions -fomit-frame-pointer"
 CFLAGS="%{rpmcflags} -fomit-frame-pointer"
 %configure \
-       %{?bcond_on_innodb:--with-innodb}  \
-       %{?bcond_on_bdb:--with-berkeley-db} \
+       %{?_with_innodb:--with-innodb}  \
+       %{?_with_bdb:--with-berkeley-db} \
        --without-debug \
        --enable-shared \
        --enable-static \
@@ -286,11 +286,11 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
           $RPM_BUILD_ROOT/var/{log/{archiv,}/mysql,lib/mysql/db} \
           $RPM_BUILD_ROOT%{_infodir}
 
-%if %{?bcond_on_innodb:1}%{!?bcond_on_innodb:0}
+%if %{?_with_innodb:1}%{!?_with_innodb:0}
 install -d $RPM_BUILD_ROOT/var/lib/mysql/innodb/{data,log}
 %endif
 
-%if %{?bcond_on_bdb:1}%{!?bcond_on_bdb:0}
+%if %{?_with_bdb:1}%{!?_with_bdb:0}
 install -d $RPM_BUILD_ROOT/var/lib/mysql/bdb/{log,tmp}
 %endif