Author: arekm Date: Sun Feb 8 10:26:47 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 5.1.31; disable NDB by default (there is separate product for that)
---- Files affected: SPECS: mysql.spec (1.434 -> 1.435) ---- Diffs: ================================================================ Index: SPECS/mysql.spec diff -u SPECS/mysql.spec:1.434 SPECS/mysql.spec:1.435 --- SPECS/mysql.spec:1.434 Tue Jan 13 13:39:44 2009 +++ SPECS/mysql.spec Sun Feb 8 11:26:42 2009 @@ -16,6 +16,7 @@ %bcond_with autodeps # BR packages needed only for resolving deps %bcond_with sphinx # Sphinx storage engine support %bcond_with tests # FIXME: don't run correctly +%bcond_with ndb # NDB is now a separate product, this here is broken, so disable it # %include /usr/lib/rpm/macros.perl Summary: MySQL: a very fast and reliable SQL database engine @@ -27,13 +28,13 @@ Summary(uk.UTF-8): MySQL - швидкий SQL-сервер Summary(zh_CN.UTF-8): MySQL数据库服务器 Name: mysql -Version: 5.1.30 -Release: 3 +Version: 5.1.31 +Release: 1 License: GPL + MySQL FLOSS Exception Group: Applications/Databases #Source0Download: http://dev.mysql.com/downloads/mysql/5.1.html#source Source0: http://mysql.easynet.be/Downloads/MySQL-5.1/%{name}-%{version}.tar.gz -# Source0-md5: b658e58887a74dce65224ae0fc8ee06a +# Source0-md5: a077387e04ea24e67a93cff5f05bc3ba Source100: http://www.sphinxsearch.com/downloads/sphinx-0.9.7.tar.gz # Source100-md5: 32f2b7e98d8485c86108851d52c5cef4 Source1: %{name}.init @@ -508,7 +509,6 @@ %{?with_big_tables:--with-big-tables} \ --with-comment="PLD Linux Distribution MySQL RPM" \ --with%{!?debug:out}-debug%{?debug:=full} \ - --with%{!?debug:out}-ndb-debug \ --with-embedded-server \ --with-extra-charsets=all \ --with-low-memory \ @@ -521,10 +521,15 @@ %{?with_federated:--with-federated-storage-engine} \ --with-fast-mutexes \ --with-vio \ - --with-ndbcluster \ --without-readline \ --without-libedit \ +%if %{with ndb} + --with%{!?debug:out}-ndb-debug \ + --with-ndbcluster \ --with-ndb-docs \ +%else + --without-ndbcluster \ +%endif --with-docs #--with-error-inject @@ -913,6 +918,7 @@ %{_mandir}/man1/mysql_setpermission.1* %{_mandir}/man1/mysql_zap.1* %{_mandir}/man1/mysqlaccess.1* +%{_mandir}/man1/mysqldumpslow.1* %{_mandir}/man1/mysqlhotcopy.1* %files client @@ -943,18 +949,22 @@ %attr(755,root,root) %ghost %{_libdir}/libmysqlclient.so.16 %attr(755,root,root) %{_libdir}/libmysqlclient_r.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libmysqlclient_r.so.16 +%if %{with ndb} %attr(755,root,root) %{_libdir}/libndbclient.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libndbclient.so.3 +%endif %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/mysql_config %attr(755,root,root) %{_libdir}/libmysqlclient.so %attr(755,root,root) %{_libdir}/libmysqlclient_r.so +%if %{with ndb} %attr(755,root,root) %{_libdir}/libndbclient.so +%{_libdir}/libndbclient.la +%endif %{_libdir}/libmysqlclient.la %{_libdir}/libmysqlclient_r.la -%{_libdir}/libndbclient.la # static-only %{_libdir}/libdbug.a %{_libdir}/libheap.a @@ -972,7 +982,9 @@ %defattr(644,root,root,755) %{_libdir}/libmysqlclient.a %{_libdir}/libmysqlclient_r.a +%if %{with ndb} %{_libdir}/libndbclient.a +%endif %files bench %defattr(644,root,root,755) @@ -989,6 +1001,7 @@ #%defattr(644,root,root,755) #%doc Docs/manual.html Docs/manual_toc.html +%if %{with ndb} %files ndb %defattr(644,root,root,755) %attr(755,root,root) %{_sbindir}/ndbd @@ -1046,6 +1059,7 @@ %attr(754,root,root) /etc/rc.d/init.d/mysql-ndb-cpc %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql-ndb-cpc %{_mandir}/man1/ndb_cpcd.1* +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -1053,6 +1067,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.435 2009/02/08 10:26:42 arekm +- up to 5.1.31; disable NDB by default (there is separate product for that) + Revision 1.434 2009/01/13 12:39:44 baggins - rel 3 - give mysqld a chance to use preconfigured mysqld.conf in 'service mysql init' ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mysql.spec?r1=1.434&r2=1.435&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
