Author: arekm Date: Mon Jan 18 18:49:34 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to mariadb 5.1.41
---- Files affected: packages/mariadb: mariadb.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/mariadb/mariadb.spec diff -u packages/mariadb/mariadb.spec:1.2 packages/mariadb/mariadb.spec:1.3 --- packages/mariadb/mariadb.spec:1.2 Mon Mar 3 21:52:10 2008 +++ packages/mariadb/mariadb.spec Mon Jan 18 19:49:26 2010 @@ -34,6 +34,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 # %include /usr/lib/rpm/macros.perl Summary: MySQL Maria Engine Preview @@ -44,13 +45,13 @@ Summary(ru.UTF-8): MySQL - быстрый SQL-сервер Summary(uk.UTF-8): MySQL - швидкий SQL-сервер Summary(zh_CN.UTF-8): MySQL数据库服务器 -Name: mysql-maria -Version: 5.1.23a +Name: mariadb +Version: 5.1.41 Release: 0.1 License: GPL + MySQL FLOSS Exception Group: Applications/Databases -Source0: http://mysql.tonnikala.org/Downloads/MySQL-5.1/mysql-%{version}-maria-alpha.tar.gz -# Source0-md5: d6b71f9b838090fc940ef2458b92d6ae +Source0: http://launchpad.net/maria/5.1/ongoing/+download/%{name}-%{version}-rc.tar.gz +# Source0-md5: e3888c0e974155924c2d66712d6d7d59 Source100: http://www.sphinxsearch.com/downloads/sphinx-0.9.7.tar.gz # Source100-md5: 32f2b7e98d8485c86108851d52c5cef4 Source1: mysql.init @@ -65,7 +66,7 @@ Source11: mysql-ndb-cpc.init Source12: mysql-ndb-cpc.sysconfig Source13: mysql-client.conf -Patch0: %{name}-libs.patch +Patch0: mysql-maria-libs.patch Patch1: mysql-libwrap.patch Patch2: mysql-c++.patch Patch3: mysql-info.patch @@ -79,7 +80,7 @@ Patch11: mysql-upgrade.patch #Patch12: mysql-NDB_CXXFLAGS.patch #Patch14: mysql-bug-18156.patch -Patch16: mysql-bug-29082.patch +#Patch16: mysql-bug-29082.patch URL: http://www.mysql.com/products/database/mysql/community_edition.html BuildRequires: autoconf BuildRequires: automake @@ -461,14 +462,14 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC. %prep -%setup -q -n mysql-%{version}-maria-alpha %{?with_sphinx:-a100} +%setup -q -n %{name}-%{version}-rc %{?with_sphinx:-a100} %if %{with sphinx} mv sphinx-*/mysqlse storage/sphinx %endif %patch0 -p1 #%{?with_tcpd:%patch1 -p1} # WHATS PURPOSE OF THIS PATCH? #%patch2 -p1 # NEEDS CHECK, which exact program needs -lc++ -%patch3 -p1 +#%patch3 -p1 # NEEDS UPDATE %ifarch alpha # this is strange: mysqld functions for UDF modules are not explicitly defined, # so -rdynamic is used; in such case gcc3+ld on alpha doesn't like C++ vtables @@ -485,7 +486,7 @@ %patch11 -p1 #%patch12 -p1 # OUTDATED? #%patch14 -p1 # OUTDATED? -%patch16 -p1 +#%patch16 -p1 # NO FILE IN CVS %build %{__libtoolize} @@ -530,10 +531,14 @@ %{?with_federated:--with-federated-storage-engine} \ --with-fast-mutexes \ --with-vio \ - --with-ndbcluster \ --without-readline \ --without-libedit \ +%if %{with ndb} + --with-ndbcluster \ --with-ndb-docs \ +%else + --without-ndbcluster \ +%endif --with-docs #--with-error-inject @@ -587,6 +592,7 @@ install mysqld.conf $RPM_BUILD_ROOT%{_datadir}/mysql/mysqld.conf cp -a %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/mysql/mysql-client.conf +%if %{with ndb} # NDB install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysql-ndb install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/mysql-ndb @@ -594,6 +600,7 @@ install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/mysql-ndb-mgm install %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysql-ndb-cpc install %{SOURCE12} $RPM_BUILD_ROOT/etc/sysconfig/mysql-ndb-cpc +%endif mv -f $RPM_BUILD_ROOT%{_libdir}/mysql/lib* $RPM_BUILD_ROOT%{_libdir} sed -i -e 's,%{_libdir}/mysql,%{_libdir},' $RPM_BUILD_ROOT{%{_libdir}/libmysqlclient{,_r}.la,%{_bindir}/mysql_config} @@ -643,13 +650,10 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/mysqlman.1* rm $RPM_BUILD_ROOT%{_bindir}/resolveip rm $RPM_BUILD_ROOT%{_mandir}/man1/resolveip.1* -rm $RPM_BUILD_ROOT%{_mandir}/man1/make_win_bin_dist.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/comp_err.1* # we don't package those (we have no -test or -testsuite pkg) and some of them just segfault rm $RPM_BUILD_ROOT%{_bindir}/mysql_client_test -rm $RPM_BUILD_ROOT%{_datadir}/mysql/mi_test_all -rm $RPM_BUILD_ROOT%{_datadir}/mysql/mi_test_all.res rm $RPM_BUILD_ROOT%{_datadir}/mysql/mysqld_multi.server rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql_client_test.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql_client_test_embedded.1* @@ -738,8 +742,9 @@ %attr(755,root,root) %{_sbindir}/mysql_fix_privilege_tables %attr(755,root,root) %{_sbindir}/mysql_upgrade %dir %{_libdir}/mysql -%attr(755,root,root) %{_libdir}/mysql/ha_blackhole.so.*.*.* -%attr(755,root,root) %{_libdir}/mysql/ha_example.so.*.*.* +%dir %{_libdir}/mysql/plugin +%attr(755,root,root) %{_libdir}/mysql/plugin/ha_blackhole.so.*.*.* +%attr(755,root,root) %{_libdir}/mysql/plugin/ha_example.so.*.*.* %{_mandir}/man1/innochecksum.1* %{_mandir}/man1/myisamchk.1* %{_mandir}/man1/myisamlog.1* @@ -803,6 +808,11 @@ %files extras %defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/maria_chk +%attr(755,root,root) %{_bindir}/maria_dump_log +%attr(755,root,root) %{_bindir}/maria_ftdump +%attr(755,root,root) %{_bindir}/maria_pack +%attr(755,root,root) %{_bindir}/maria_read_log %attr(755,root,root) %{_bindir}/msql2mysql %attr(755,root,root) %{_bindir}/myisam_ftdump %attr(755,root,root) %{_bindir}/mysql_secure_installation @@ -859,9 +869,16 @@ %files libs %defattr(644,root,root,755) %doc EXCEPTIONS-CLIENT -%attr(755,root,root) %{_libdir}/lib*.so.*.* %attr(751,root,root) %dir %{_sysconfdir}/mysql %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysql/mysql-client.conf +%attr(755,root,root) %{_libdir}/libmysqlclient.so.*.*.* +%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) @@ -890,6 +907,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 @@ -947,6 +965,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 @@ -954,6 +973,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2010/01/18 18:49:26 arekm +- up to mariadb 5.1.41 + Revision 1.2 2008/03/03 20:52:10 glen - builds ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mariadb/mariadb.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
