Author: arekm Date: Sat Jul 9 16:33:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - there is now mysql-client.conf which is always processed by mysql_init()
---- Files affected: SPECS: mysql.spec (1.282 -> 1.283) ---- Diffs: ================================================================ Index: SPECS/mysql.spec diff -u SPECS/mysql.spec:1.282 SPECS/mysql.spec:1.283 --- SPECS/mysql.spec:1.282 Sat Jul 9 15:57:31 2005 +++ SPECS/mysql.spec Sat Jul 9 18:33:06 2005 @@ -25,7 +25,7 @@ Name: mysql Group: Applications/Databases Version: 4.1.12 -Release: 1.2 +Release: 1.4 License: GPL + MySQL FLOSS Exception Source0: http://mysql.dataphone.se/Downloads/MySQL-4.1/%{name}-%{version}.tar.gz # Source0-md5: 56a6f5cacd97ae290e07bbe19f279af1 @@ -41,6 +41,7 @@ Source10: %{name}-ndb-mgm.sysconfig Source11: %{name}-ndb-cpc.init Source12: %{name}-ndb-cpc.sysconfig +Source13: %{name}-client.conf Patch0: %{name}-libs.patch Patch1: %{name}-libwrap.patch Patch2: %{name}-c++.patch @@ -49,6 +50,7 @@ Patch5: %{name}-noproc.patch Patch6: %{name}-fix_privilege_tables.patch Patch7: %{name}-align.patch +Patch8: %{name}-client-config.patch Icon: mysql.gif URL: http://www.mysql.com/ #BuildRequires: ORBit-devel @@ -424,6 +426,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %{__perl} -pi -e 's@(ndb_bin_am_ldflags)="-static"@$1=""@' configure.in @@ -458,8 +461,6 @@ --with-comment="PLD Linux Distribution MySQL RPM" \ --with%{!?debug:out}-debug \ --with-embedded-server \ - --with-charset=latin2 \ - --with-collation=latin2_general_ci \ --with-extra-charsets=all \ --with-low-memory \ --with-mysqld-user=mysql \ @@ -526,6 +527,7 @@ %endif install mysqld.conf $RPM_BUILD_ROOT%{_datadir}/mysql/mysqld.conf +install %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/mysql/mysql-client.conf # NDB install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysql-ndb @@ -695,7 +697,6 @@ %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/mysql %attr(754,root,root) /etc/rc.d/init.d/mysql %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql -%attr(751,root,root) %dir %{_sysconfdir}/mysql %attr(640,root,mysql) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysql/clusters.conf %attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/monit/*.monitrc %attr(755,root,root) %{_bindir}/isamchk @@ -797,6 +798,8 @@ %defattr(644,root,root,755) %doc EXCEPTIONS-CLIENT %attr(755,root,root) %{_libdir}/lib*.so.*.* +%attr(751,root,root) %dir %{_sysconfdir}/mysql +%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysql/mysql-client.conf %files devel %defattr(644,root,root,755) @@ -855,6 +858,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.283 2005/07/09 16:33:06 arekm +- there is now mysql-client.conf which is always processed by mysql_init() + Revision 1.282 2005/07/09 13:57:31 arekm - set collation to latin2-like, too. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.282&r2=1.283&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
