SPECS (DEVEL): mysql.spec - merge changes from HEAD
glen
glen at pld-linux.org
Tue Oct 17 16:31:27 CEST 2006
Author: glen Date: Tue Oct 17 14:31:27 2006 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- merge changes from HEAD
---- Files affected:
SPECS:
mysql.spec (1.324.2.3 -> 1.324.2.4)
---- Diffs:
================================================================
Index: SPECS/mysql.spec
diff -u SPECS/mysql.spec:1.324.2.3 SPECS/mysql.spec:1.324.2.4
--- SPECS/mysql.spec:1.324.2.3 Tue Oct 17 15:31:51 2006
+++ SPECS/mysql.spec Tue Oct 17 16:31:22 2006
@@ -1,34 +1,28 @@
# $Revision$, $Date$
# TODO:
# - trigger that prepares system from pre-cluster into cluster
-# - C(XX)FLAGS for innodb subdirs are overriden by ./configre!
+# - C(XX)FLAGS for innodb subdirs are overriden by ./configure!
# - http://bugs.mysql.com/bug.php?id=16470
+# - innodb, dbd are dynamic (= as plugins) ?
# - warning: Installed (but unpackaged) file(s) found:
# /usr/bin/benchmark
# /usr/bin/mysql_client_test
-# /usr/bin/mysql_upgrade
# /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/myisam_ftdump.1.gz
-# /usr/share/man/man1/mysql_upgrade.1.gz
-# /usr/share/man/man1/mysqlman.1.gz
# /usr/share/man/man1/mysqlslap.1.gz
-# /usr/share/mysql/errmsg.txt
# /usr/share/mysql/mi_test_all
# /usr/share/mysql/mi_test_all.res
-# /usr/share/mysql/ndb_size.tmpl
-# - innodb, dbd are dynamic (= as plugins) ?
#
# Conditional build:
-%bcond_with bdb # Berkeley DB support
-%bcond_without innodb # Without InnoDB support
-%bcond_without raid # Without raid
-%bcond_without ssl # Without OpenSSL
-%bcond_without tcpd # Without libwrap (tcp_wrappers) support
+%bcond_with bdb # Berkeley DB support
+%bcond_without innodb # Without InnoDB support
+%bcond_without raid # Without raid
+%bcond_without ssl # Without OpenSSL
+%bcond_without tcpd # Without libwrap (tcp_wrappers) support
%bcond_without big_tables # Support tables with more than 4G rows even on 32 bit platforms
#
%include /usr/lib/rpm/macros.perl
@@ -42,7 +36,7 @@
Summary(zh_CN): MySQLĘýžÝżâˇţÎńĆ÷
Name: mysql
Version: 5.1.11
-Release: 0.1
+Release: 0.2
License: GPL + MySQL FLOSS Exception
Group: Applications/Databases
Source0: http://mysql.dataphone.se/Downloads/MySQL-5.1/%{name}-%{version}-beta.tar.gz
@@ -71,7 +65,7 @@
Patch8: %{name}-client-config.patch
Patch9: %{name}-build.patch
Patch10: %{name}-alpha.patch
-URL: http://www.mysql.com/
+URL: http://www.mysql.com/products/database/mysql/community_edition.html
BuildRequires: autoconf
BuildRequires: automake
%{?with_bdb:BuildRequires: db3-devel}
@@ -84,7 +78,7 @@
BuildRequires: perl-devel >= 1:5.6.1
BuildRequires: readline-devel >= 4.2
BuildRequires: rpm-perlprov >= 4.1-13
-BuildRequires: rpmbuild(macros) >= 1.228
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.0
BuildRequires: texinfo
BuildRequires: zlib-devel
@@ -287,7 +281,7 @@
%package libs
Summary: Shared libraries for MySQL
Summary(pl): Biblioteki dzielone MySQL
-Group: Applications/Databases
+Group: Libraries
Obsoletes: libmysql10
Obsoletes: mysql-doc < 4.1.12
@@ -540,7 +534,7 @@
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/*/*.txt
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
+sed -i -e 's,%{_libdir}/mysql,%{_libdir},' $RPM_BUILD_ROOT{%{_libdir}/libmysqlclient{,_r}.la,%{_bindir}/mysql_config}
# remove known unpackaged files
rm -rf $RPM_BUILD_ROOT%{_prefix}/mysql-test
@@ -562,13 +556,14 @@
rm $RPM_BUILD_ROOT%{_bindir}/mysqld_safe
rm $RPM_BUILD_ROOT%{_bindir}/mysqld_multi
rm $RPM_BUILD_ROOT%{_mandir}/man1/mysqld_{multi,safe}*
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/fill_help_tables.sql
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql-log-rotate
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql.server
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/binary-configure
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/errmsg.txt
rm $RPM_BUILD_ROOT%{_bindir}/mysql_waitpid
rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql.server*
rm $RPM_BUILD_ROOT%{_mandir}/man1/safe_mysqld*
+rm $RPM_BUILD_ROOT%{_mandir}/man1/mysqlman.1*
# in %doc
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.{ini,cnf}
@@ -583,17 +578,7 @@
%post
[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
/sbin/chkconfig --add mysql
-
-if [ "$1" = 1 ]; then
- %banner -e %{name}-4.1.x <<-EOF
- If you want to use new help tables in mysql 4.1.x then you'll need to import the help data:
- zcat %{_docdir}/%{name}-%{version}/fill_help_tables.sql.gz | mysql mysql
-EOF
-#'
-fi
-
%service mysql restart
-exit 0
%preun
if [ "$1" = "0" ]; then
@@ -610,50 +595,32 @@
%post ndb
/sbin/chkconfig --add mysql-ndb
-if [ -f /var/lock/subsys/mysql-ndb ]; then
- /etc/rc.d/init.d/mysql-ndb restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/mysql-ndb start\" to start mysql NDB engine." >&2
-fi
+%service mysql-ndb restart "mysql NDB engine"
%preun ndb
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/mysql-ndb ]; then
- /etc/rc.d/init.d/mysql-ndb stop
- fi
- /sbin/chkconfig --del mysql-ndb
+ %service mysql-ndb stop
+ /sbin/chkconfig --del mysql-ndb
fi
%post ndb-mgm
/sbin/chkconfig --add mysql-ndb-mgm
-if [ -f /var/lock/subsys/mysql-ndb-mgm ]; then
- /etc/rc.d/init.d/mysql-ndb-mgm restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/mysql-ndb-mgm start\" to start mysql NDB management node." >&2
-fi
+%service mysql-ndb-mgm restart "mysql NDB management node"
%preun ndb-mgm
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/mysql-ndb-mgm ]; then
- /etc/rc.d/init.d/mysql-ndb-mgm stop
- fi
- /sbin/chkconfig --del mysql-ndb-mgm
+ %service mysql-ndb-mgm stop
+ /sbin/chkconfig --del mysql-ndb-mgm
fi
%post ndb-cpc
/sbin/chkconfig --add mysql-ndb-cpc
-if [ -f /var/lock/subsys/mysql-ndb-cpc ]; then
- /etc/rc.d/init.d/mysql-ndb-cpc restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/mysql-ndb-cpc start\" to start mysql NDB CPC." >&2
-fi
+%service mysql-ndb-cpc restart "mysql NDB CPC"
%preun ndb-cpc
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/mysql-ndb-cpc ]; then
- /etc/rc.d/init.d/mysql-ndb-cpc stop
- fi
- /sbin/chkconfig --del mysql-ndb-cpc
+ %service mysql-ndb-cpc stop
+ /sbin/chkconfig --del mysql-ndb-cpc
fi
%post libs -p /sbin/ldconfig
@@ -708,31 +675,33 @@
done
%banner -e %{name}-4.1.x <<-EOF
- If you want to use new help tables in mysql 4.1.x then you'll need to import the help data:
- zcat %{_docdir}/%{name}-%{version}/fill_help_tables.sql.gz | mysql mysql
+ If you want to use new help tables in MySQL 4.1.x then You'll need to import the help data:
+ mysql -u mysql mysql < %{_datadir}/%{name}/fill_help_tables.sql
EOF
#'
%files
%defattr(644,root,root,755)
-%doc support-files/*.cnf support-files/*.ini scripts/fill_help_tables.sql
+%doc support-files/*.cnf support-files/*.ini
%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(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(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/monit/*.monitrc
%attr(755,root,root) %{_bindir}/innochecksum
%attr(755,root,root) %{_bindir}/myisamchk
%attr(755,root,root) %{_bindir}/myisamlog
%attr(755,root,root) %{_bindir}/myisampack
%attr(755,root,root) %{_bindir}/mysql_fix_privilege_tables
%attr(755,root,root) %{_bindir}/my_print_defaults
+%attr(755,root,root) %{_bindir}/mysql_upgrade
%attr(755,root,root) %{_sbindir}/mysqld
%{_mandir}/man1/mysql_fix_privilege_tables.1*
%{_mandir}/man1/mysqld.1*
%{_mandir}/man1/myisamchk.1*
%{_mandir}/man1/myisamlog.1*
%{_mandir}/man1/myisampack.1*
+%{_mandir}/man1/mysql_upgrade.1*
%attr(700,mysql,mysql) %{_mysqlhome}
# root:root is proper here for AC mysql.rpm while mysql:mysql is potential security hole
@@ -745,6 +714,7 @@
# This is template for configuration file which is created after 'service mysql init'
%{_datadir}/mysql/mysqld.conf
%{_datadir}/mysql/english
+%{_datadir}/mysql/fill_help_tables.sql
%{_datadir}/mysql/mysql_fix_privilege_tables.sql
%lang(cs) %{_datadir}/mysql/czech
%lang(da) %{_datadir}/mysql/danish
@@ -785,6 +755,7 @@
%attr(755,root,root) %{_bindir}/replace
%attr(755,root,root) %{_bindir}/resolveip
%{_mandir}/man1/msql2mysql.1*
+%{_mandir}/man1/myisam_ftdump.1*
%{_mandir}/man1/mysqlcheck.1*
%{_mandir}/man1/perror.1*
%{_mandir}/man1/replace.1*
@@ -792,14 +763,14 @@
%files extras-perl
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/mysql_convert_table_format
-%attr(755,root,root) %{_bindir}/mysqldumpslow
-%attr(755,root,root) %{_bindir}/mysqlhotcopy
+%attr(755,root,root) %{_bindir}/mysql_explain_log
+%attr(755,root,root) %{_bindir}/mysql_find_rows
+%attr(755,root,root) %{_bindir}/mysql_fix_extensions
%attr(755,root,root) %{_bindir}/mysql_setpermission
%attr(755,root,root) %{_bindir}/mysql_zap
-%attr(755,root,root) %{_bindir}/mysql_find_rows
%attr(755,root,root) %{_bindir}/mysqlaccess
-%attr(755,root,root) %{_bindir}/mysql_fix_extensions
-%attr(755,root,root) %{_bindir}/mysql_explain_log
+%attr(755,root,root) %{_bindir}/mysqldumpslow
+%attr(755,root,root) %{_bindir}/mysqlhotcopy
%{_mandir}/man1/mysql_zap.1*
%{_mandir}/man1/mysqlaccess.1*
%{_mandir}/man1/mysqlhotcopy.1*
@@ -855,6 +826,7 @@
%files ndb-client
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/ndb_*
+%attr(755,root,root) %{_datadir}/mysql/ndb_size.tmpl
%files ndb-mgm
%defattr(644,root,root,755)
@@ -874,6 +846,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.324.2.4 2006/10/17 14:31:22 glen
+- merge changes from HEAD
+
Revision 1.324.2.3 2006/10/17 13:31:51 glen
- 5.1.1-beta, sql-bench is gone
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.324.2.3&r2=1.324.2.4&f=u
More information about the pld-cvs-commit
mailing list