From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Tue, 27 Jul 2004 20:12:41 +0000 (+0000)
Subject: - remove wrong mysqld.conf, template is back
X-Git-Tag: auto/ac/mysql-4_0_20-3~5
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=dbf4eb6adc25ea2dce37e6e4f640d1cc1765b5bd;p=packages%2Fmysql.git

- remove wrong mysqld.conf, template is back

Changed files:
    mysql.spec -> 1.221
---

diff --git a/mysql.spec b/mysql.spec
index e0b3e70..1f09e3f 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -418,7 +418,8 @@ install Docs/mysql.info $RPM_BUILD_ROOT%{_infodir}
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysql
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/mysql
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/mysql
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/mysql/mysqld.conf
+# This is template for configuration file which is created after 'service mysql init'
+install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/mysql/mysqld.conf
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/mysql/clusters.conf
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/monit
 touch $RPM_BUILD_ROOT/var/log/mysql/{err,log,update,isamlog.log}
@@ -501,7 +502,6 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/mysql
 %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/mysql
 %attr(751,root,root) %dir /etc/mysql
-%attr(640,mysql,mysql) %config(noreplace) %verify(not md5 size mtime) /etc/mysql/mysqld.conf
 %attr(640,root,mysql) %config(noreplace) %verify(not md5 size mtime) /etc/mysql/clusters.conf
 %attr(750,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/monit/*.monitrc
 %attr(755,root,root) %{_bindir}/isamchk
@@ -524,8 +524,8 @@ fi
 
 %{_infodir}/mysql.info*
 %dir %{_datadir}/mysql
-# not needed?
-#%{_datadir}/mysql/mysqld.conf
+# This is template for configuration file which is created after 'service mysql init'
+%{_datadir}/mysql/mysqld.conf
 %{_datadir}/mysql/charsets
 %{_datadir}/mysql/english
 %lang(cs) %{_datadir}/mysql/czech