Author: glen Date: Sat Oct 21 12:41:28 2006 GMT Module: SPECS Tag: DEVEL ---- Log message: - added mysqlslap to -client package - cleanups, pass --with-plugins
---- Files affected: SPECS: mysql.spec (1.324.2.4 -> 1.324.2.5) ---- Diffs: ================================================================ Index: SPECS/mysql.spec diff -u SPECS/mysql.spec:1.324.2.4 SPECS/mysql.spec:1.324.2.5 --- SPECS/mysql.spec:1.324.2.4 Tue Oct 17 16:31:22 2006 +++ SPECS/mysql.spec Sat Oct 21 14:41:23 2006 @@ -7,15 +7,13 @@ # - warning: Installed (but unpackaged) file(s) found: # /usr/bin/benchmark # /usr/bin/mysql_client_test -# /usr/bin/mysqlslap # /usr/bin/test # /usr/bin/testsuite -# /usr/lib/mysql/ha_blackhole.a -# /usr/lib/mysql/ha_blackhole.la -# /usr/lib/mysql/ha_blackhole.so.0.0.0 -# /usr/share/man/man1/mysqlslap.1.gz # /usr/share/mysql/mi_test_all # /usr/share/mysql/mi_test_all.res +# - berkeley is still compiled in regardless of --without conf arg +# - missing have_archive, have_merge +# - is plugin_dir lib64 safe? # # Conditional build: %bcond_with bdb # Berkeley DB support @@ -36,7 +34,7 @@ Summary(zh_CN): MySQLĘýžÝżâˇţÎńĆ÷ Name: mysql Version: 5.1.11 -Release: 0.2 +Release: 0.3 License: GPL + MySQL FLOSS Exception Group: Applications/Databases Source0: http://mysql.dataphone.se/Downloads/MySQL-5.1/%{name}-%{version}-beta.tar.gz @@ -98,8 +96,8 @@ Provides: msqlormysql Provides: user(mysql) Obsoletes: MySQL -Obsoletes: mysql-server Obsoletes: mysql-bench < 5.1.11 +Obsoletes: mysql-server BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _libexecdir %{_sbindir} @@ -108,6 +106,9 @@ %define _noautoreqdep 'perl(DBD::mysql)' +# readline/libedit detection goes wrong +%undefine configure_cache + %description MySQL is a true multi-user, multi-threaded SQL (Structured Query Language) database server. SQL is the most popular database language @@ -421,8 +422,6 @@ %patch8 -p1 %patch9 -p1 -%{__perl} -pi -e 's@(ndb_bin_am_ldflags)="-static"@$1=""@' configure.in - %build %{__libtoolize} %{__aclocal} @@ -454,7 +453,7 @@ --with%{!?with_tcpd:out}-libwrap \ %{?with_big_tables:--with-big-tables} \ --with-comment="PLD Linux Distribution MySQL RPM" \ - --with%{!?debug:out}-debug \ + --with%{!?debug:out}-debug%{?debug:=full} \ --with%{!?debug:out}-ndb-debug \ --with-embedded-server \ --with-extra-charsets=all \ @@ -464,13 +463,16 @@ --with-named-thread-libs="-lpthread" \ --with-unix-socket-path=/var/lib/mysql/mysql.sock \ --with-archive-storage-engine \ + --with-plugins=berkeley,blackhole,csv,federated,ftexample,heap,innobase,myisam,myisammrg,ndbcluster,partition \ + --with-fast-mutexes \ --with-vio \ --with-ndbcluster \ --without-readline \ --without-libedit \ - --without-docs -# --with-mysqlfs -# --with-ndb-test --with-ndb-docs + --with-ndb-docs \ + --with-docs + +#--with-error-inject # NOTE that /var/lib/mysql/mysql.sock is symlink to real sock file # (it defaults to first cluster but user may change it to whatever @@ -479,7 +481,6 @@ echo -e "all:\ninstall:\nclean:\nlink_sources:\n" > libmysqld/examples/Makefile %{__make} -%{__make} -C Docs mysql.info %install rm -rf $RPM_BUILD_ROOT @@ -778,21 +779,23 @@ %files client %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/mysql +%attr(755,root,root) %{_bindir}/mysqladmin +%attr(755,root,root) %{_bindir}/mysqlbinlog %attr(755,root,root) %{_bindir}/mysqlbug %attr(755,root,root) %{_bindir}/mysqldump %attr(755,root,root) %{_bindir}/mysqlimport -%attr(755,root,root) %{_sbindir}/mysqlmanager* %attr(755,root,root) %{_bindir}/mysqlshow -%attr(755,root,root) %{_bindir}/mysqlbinlog -%attr(755,root,root) %{_bindir}/mysqladmin +%attr(755,root,root) %{_bindir}/mysqlslap %attr(755,root,root) %{_bindir}/mysqltest* +%attr(755,root,root) %{_sbindir}/mysqlmanager* %{_mandir}/man1/mysql.1* %{_mandir}/man1/mysqladmin.1* -%{_mandir}/man1/mysqldump.1* -%{_mandir}/man1/mysqlshow.1* -%{_mandir}/man1/mysqlmanager.1* %{_mandir}/man1/mysqlbinlog.1* +%{_mandir}/man1/mysqldump.1* %{_mandir}/man1/mysqlimport.1* +%{_mandir}/man1/mysqlmanager.1* +%{_mandir}/man1/mysqlshow.1* +%{_mandir}/man1/mysqlslap.1* %files libs %defattr(644,root,root,755) @@ -846,6 +849,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.324.2.5 2006/10/21 12:41:23 glen +- added mysqlslap to -client package +- cleanups, pass --with-plugins + Revision 1.324.2.4 2006/10/17 14:31:22 glen - merge changes from HEAD ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.324.2.4&r2=1.324.2.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
