- more macros

Changed files:
    mysql.spec -> 1.172

diff --git a/mysql.spec b/mysql.spec
index 2c42ed9a7347d06d2bd5528d099875adfa82dc27..ed3f213ac112c5561aaaff868c6b2c22cccd72ed 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -65,6 +65,7 @@ Obsoletes:    mysql-server
 
 %define                _libexecdir     %{_sbindir}
 %define                _localstatedir  /var/lib/mysql
+%define                _mysqlhome      /home/services/mysql
 
 %description
 MySQL is a true multi-user, multi-threaded SQL (Structured Query
@@ -374,7 +375,7 @@ rm -rf $RPM_BUILD_ROOT
 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} \
-          $RPM_BUILD_ROOT/home/services/mysql
+          $RPM_BUILD_ROOT%{_mysqlhome}
 
 install -d $RPM_BUILD_ROOT/var/lib/mysql/innodb/{data,log}
 %if %{?_with_bdb:1}%{!?_with_bdb:0}
@@ -420,7 +421,7 @@ if [ -n "`id -u mysql 2>/dev/null`" ]; then
        fi
 else
        /usr/sbin/useradd -M -o -r -u 89 \
-                       -d /home/services/mysql -s /bin/sh -g mysql \
+                       -d %{_mysqlhome} -s /bin/sh -g mysql \
                        -c "MySQL Server" mysql 1>&2
 fi
 
@@ -468,7 +469,7 @@ fi
 %{_mandir}/man1/isamlog.1*
 %{_mandir}/man1/mysqld.1*
 
-%attr(700,mysql,mysql) /home/services/mysql
+%attr(700,mysql,mysql) %{_mysqlhome}
 %attr(751,mysql,mysql) /var/lib/mysql
 %attr(750,mysql,mysql) %dir /var/log/mysql
 %attr(750,mysql,mysql) %dir /var/log/archiv/mysql