SPECS: mysql.spec - merge from DEVEL; cut down changelog
arekm
arekm at pld-linux.org
Mon Oct 24 19:20:58 CEST 2005
Author: arekm Date: Mon Oct 24 17:20:58 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merge from DEVEL; cut down changelog
---- Files affected:
SPECS:
mysql.spec (1.300 -> 1.301)
---- Diffs:
================================================================
Index: SPECS/mysql.spec
diff -u SPECS/mysql.spec:1.300 SPECS/mysql.spec:1.301
--- SPECS/mysql.spec:1.300 Thu Oct 20 17:04:08 2005
+++ SPECS/mysql.spec Mon Oct 24 19:20:46 2005
@@ -7,11 +7,11 @@
# Conditional build:
%bcond_with bdb # Berkeley DB support
%bcond_without innodb # Without InnoDB support
-%bcond_without isam # Without ISAM table format (used in mysql 3.22)
%bcond_without raid # Without raid
%bcond_without ssl # Without OpenSSL
%bcond_without tcpd # Without libwrap (tcp_wrappers) support
-%bcond_with big_tables # enable '--with-big-tables', some performance loss on 32bit arch, but can do >= 4GB database tables.
+%bcond_with big_tables # enable '--with-big-tables', some performance loss on 32bit arch,
+ # but can do >= 4GB database tables.
#
%include /usr/lib/rpm/macros.perl
Summary: MySQL: a very fast and reliable SQL database engine
@@ -24,11 +24,11 @@
Summary(zh_CN): MySQLĘýžÝżâˇţÎńĆ÷
Name: mysql
Group: Applications/Databases
-Version: 4.1.15
-Release: 2
+Version: 5.0.15
+Release: 1
License: GPL + MySQL FLOSS Exception
-Source0: http://mysql.dataphone.se/Downloads/MySQL-4.1/%{name}-%{version}.tar.gz
-# Source0-md5: 65a0841e592641b8816f9212aaa40176
+Source0: http://sunsite.icm.edu.pl/mysql/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
+# Source0-md5: b19e03de0ec348552b4bfac2e215f335
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.logrotate
@@ -51,9 +51,9 @@
Patch6: %{name}-fix_privilege_tables.patch
Patch7: %{name}-align.patch
Patch8: %{name}-client-config.patch
+Patch9: %{name}-build.patch
Icon: mysql.gif
URL: http://www.mysql.com/
-#BuildRequires: ORBit-devel
BuildRequires: autoconf
BuildRequires: automake
%{?with_bdb:BuildRequires: db3-devel}
@@ -69,7 +69,7 @@
BuildRequires: rpmbuild(macros) >= 1.228
BuildRequires: texinfo
BuildRequires: zlib-devel
-PreReq: rc-scripts >= 0.2.0
+Requires: rc-scripts >= 0.2.0
Requires(pre): /usr/bin/getgid
Requires(pre): /bin/id
Requires(pre): /usr/sbin/groupadd
@@ -428,6 +428,7 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%{__perl} -pi -e 's@(ndb_bin_am_ldflags)="-static"@$1=""@' configure.in
@@ -436,6 +437,7 @@
%{__aclocal}
%{__automake}
%{__autoconf}
+
# The compiler flags are as per their "official" spec ;)
CXXFLAGS="%{rpmcflags} -felide-constructors -fno-rtti -fno-exceptions %{!?debug:-fomit-frame-pointer}"
CFLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer}"
@@ -443,6 +445,7 @@
# NOTE: the PS, FIND_PROC, KILL, CHECK_PID are not used by PLD Linux
# and therefore do not add BR on these. These are here just to satisfy
# configure.
+
%configure \
PS='/bin/ps' \
FIND_PROC='/bin/ps p $$PID' \
@@ -454,7 +457,6 @@
--enable-thread-safe-client \
--with%{!?with_bdb:out}-berkeley-db \
--with%{!?with_innodb:out}-innodb \
- --with%{!?with_isam:out}-isam \
--with%{!?with_raid:out}-raid \
--with%{!?with_ssl:out}-openssl \
--with%{!?with_tcpd:out}-libwrap \
@@ -486,6 +488,8 @@
%{__make} \
benchdir=$RPM_BUILD_ROOT%{_datadir}/sql-bench
+# workaround for missing files
+(cd Docs; touch Images/cluster-components-1.txt Images/multi-comp-1.txt errmsg-table.texi cl-errmsg-table.texi)
%{__make} -C Docs mysql.info
%install
@@ -514,7 +518,7 @@
install %{SOURCE4} mysqld.conf
install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/mysql/clusters.conf
install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/monit
-touch $RPM_BUILD_ROOT/var/log/mysql/{err,log,update,isamlog.log}
+touch $RPM_BUILD_ROOT/var/log/mysql/{err,log,update}
# remove innodb directives from mysqld.conf if mysqld is configured without
%if %{without innodb}
@@ -714,17 +718,13 @@
%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(755,root,root) %{_bindir}/isamchk
-%attr(755,root,root) %{_bindir}/isamlog
+%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}/pack_isam
%attr(755,root,root) %{_bindir}/my_print_defaults
%attr(755,root,root) %{_sbindir}/mysqld
-%{_mandir}/man1/isamchk.1*
-%{_mandir}/man1/isamlog.1*
%{_mandir}/man1/mysql_fix_privilege_tables.1*
%{_mandir}/man1/mysqld.1*
@@ -800,10 +800,11 @@
%attr(755,root,root) %{_bindir}/mysqlbug
%attr(755,root,root) %{_bindir}/mysqldump
%attr(755,root,root) %{_bindir}/mysqlimport
-%attr(755,root,root) %{_bindir}/mysqlmanager*
+%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}/mysqltest*
%{_mandir}/man1/mysql.1*
%{_mandir}/man1/mysqladmin.1*
%{_mandir}/man1/mysqldump.1*
@@ -873,6 +874,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.301 2005/10/24 17:20:46 arekm
+- merge from DEVEL; cut down changelog
+
Revision 1.300 2005/10/20 15:04:08 glen
- enable archive-storage-engine; rel 2
@@ -888,490 +892,4 @@
Revision 1.296 2005/08/25 18:25:11 glen
- updated to 4.1.14
-Revision 1.295 2005/07/27 13:51:06 glen
-- guide where are the help tables data (probably it should be instead in initscript?)
-
-Revision 1.294 2005/07/21 14:13:50 glen
-- use %service macro for mysql server
-- rel 1; STBR
-
-Revision 1.293 2005/07/21 13:37:23 glen
-- fetch 4.1.13 sources
-
-Revision 1.292 2005/07/21 13:34:08 glen
-- rel 3
-
-Revision 1.291 2005/07/21 13:33:41 glen
-- log files as %ghost not %config
-
-Revision 1.290 2005/07/18 14:22:19 glen
-- xargs not neccessary in last trigger
-
-Revision 1.289 2005/07/18 13:27:26 glen
-- fix mysql 4.1.1 migration trigger where one has leading space in cluster definition
-
-Revision 1.288 2005/07/09 23:46:40 arekm
-- rel 2
-
-Revision 1.287 2005/07/09 23:36:21 glen
-- put mysql-doc to proper place (-libs)
-
-Revision 1.286 2005/07/09 23:18:06 glen
-- include fill_help_tables.sql in %doc
-
-Revision 1.285 2005/07/09 23:06:26 glen
-- mysql.init violates LSB (or whatever) and exits with failure on stop. let the %post script still work and ignore restart error code
-
-Revision 1.284 2005/07/09 18:15:30 glen
-- mysql-doc package is gone since 4.1.12. obsolete it by main package
-
-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.
-
-Revision 1.281 2005/07/09 13:49:39 arekm
-- fix log (latin2)
-
-Revision 1.280 2005/07/09 13:41:53 arekm
-- switch by default to latin2 (of course latin1 still can be changed runtime but not exactly in the same way as setting here)
-
-Revision 1.279 2005/06/16 13:44:33 glen
-- improved mysql old-passwords migration trigger
-- fixes cases when mysqld.conf was in clusterdir
-
-Revision 1.278 2005/05/19 19:07:45 glen
-- rel 1; STBR if you wish
-
-Revision 1.277 2005/05/19 16:14:41 glen
-- added bigtables bcond
-- cleanup on options
-- mysql_client_test moved to bench
-
-Revision 1.276 2005/05/17 18:03:02 glen
-- %clean back
-
-Revision 1.275 2005/05/17 17:39:25 qboosh
-- removed obsolete nptl patch
-
-Revision 1.274 2005/05/17 08:38:31 ankry
-- reverted: we don't have ja_JP.SJIS locale (unsupported)
-
-Revision 1.273 2005/05/16 16:40:13 glen
-- mysqltest moved to -bench
-
-Revision 1.272 2005/05/16 16:33:00 glen
-- no point creating empty -doc package
-
-Revision 1.271 2005/05/16 16:31:09 glen
-- use locale that arekm tought will do (smb like ankry please check this)
-
-Revision 1.270 2005/05/16 16:20:15 glen
-- package the new files into appropriate subpackages instead of just removing them
-
-Revision 1.269 2005/05/16 16:08:33 glen
-- resolved little unpackaged files
-
-Revision 1.268 2005/05/16 15:44:32 glen
-- remove Docs workaround (no longer needed)
-- remove BR on /bin/ps, only one that needed PS, KILL, FIND_PROC,
- CHECK_PID was safe_mysqld, but PLD has it's own initscript
-- remove STUPID typo which killed .txt files from source tree and
- broke re-entrant %install
-
-Revision 1.267 2005/05/16 06:42:55 glen
-- add innotests to -bench package
-
-Revision 1.266 2005/05/16 05:58:20 glen
-- no more html Docs. bug? gone forever?
-
-Revision 1.265 2005/05/16 05:29:23 glen
-- updated info patch
-- ntpl patch not needed? (please check)
-
-Revision 1.264 2005/05/16 05:00:41 glen
-- fetch 4.1.12 sources (from a closer mirror)
-
-Revision 1.263 2005/05/01 17:31:30 glen
-- use %useradd/%groupadd macros
-
-Revision 1.262 2005/04/26 10:58:06 arekm
-- rel 2
-
-Revision 1.261 2005/04/07 20:06:21 arekm
-- up to 4.1.11 (my_print_defaults is needed by mysql_fix_pri* so moved to proper psubpackage).
-
-Revision 1.260 2005/04/04 18:00:21 blues
-- trigger to use old password() function, even after fixing tables.
-
-Revision 1.259 2005/03/23 11:55:23 spider
-- added german description
-
-Revision 1.258 2005/03/13 10:33:45 arekm
-- up to 4.1.10a (security fixes)
-
-Revision 1.257 2005/03/04 21:18:34 qboosh
-- grr, more align workarounds; release 2
-
-Revision 1.256 2005/03/04 12:36:47 qboosh
-- added align patch (workaround not to use void* alignment when accessing chars)
-- dropped obsolete -mno-explicit-relocs hack
-- release 1
-
-Revision 1.255 2005/02/15 22:51:12 glen
-- merge from AC-branch: bconds, CXXFLAGS optimize
-
-Revision 1.254 2005/02/15 18:48:06 qboosh
-- cosmetic
-
-Revision 1.253 2005/02/15 18:34:32 glen
-- 4.1.10 (mysqlaccess patch obsolete)
-- adapterized
-
-Revision 1.252 2005/02/12 19:52:39 arekm
-- rel 1
-
-Revision 1.251 2005/02/06 17:56:34 qboosh
-- updated to 4.1.9, updated libwrap patch, removed obsolete _r-link patch
-
-Revision 1.250 2005/01/24 13:20:49 krolik
-- security patch, rel. 0.2
-- STBR
-
-Revision 1.249 2004/12/29 13:11:57 zergin
-- updated to newest version: 4.1.8a
-
-Revision 1.248 2004/12/26 11:39:32 qboosh
-- fixed nasty typo in libs patch, release 0.2
-
-Revision 1.247 2004/12/25 13:01:42 qboosh
-- removed lib64 breakage from nptl patch
-
-Revision 1.246 2004/12/24 15:56:23 qboosh
-- hack ndb_bin_am_ldflags to kill static linking with libstdc++
-
-Revision 1.245 2004/12/17 00:57:17 glen
-- 4.1.8
-
-Revision 1.244 2004/10/31 20:47:05 qboosh
-- lang fix
-
-Revision 1.243 2004/10/29 10:03:39 qboosh
-- removed outdated dump_quote_db_names patch
-
-Revision 1.242 2004/10/28 09:35:47 arekm
-- rel 0.2; works for me on my ac server btw. (server updated while client using old mysql-libs)
-
-Revision 1.241 2004/10/28 05:55:48 blues
-- moved fix privileges script to main package
-
-Revision 1.240 2004/10/27 21:29:25 qboosh
-- pl for -ndb*
-
-Revision 1.239 2004/10/27 10:15:26 arekm
-- add mysql_fix_privilege_tables.sql to extras subpackage
-
-Revision 1.238 2004/10/27 02:48:32 arekm
-- ndb update
-
-Revision 1.237 2004/10/27 02:11:30 arekm
-- TODO items; drop config caching (breaks things); turn on NDB engine
-
-Revision 1.236 2004/10/26 23:24:26 arekm
-- fetch src
-
-Revision 1.235 2004/10/25 09:10:23 qboosh
-- release 2: rebuild with more mysql.init fixes
-
-Revision 1.234 2004/10/13 23:21:19 ankry
-- %userremove/%groupremove support, standardized
-
-Revision 1.233 2004/09/19 20:10:26 blues
-- release 1.9 - consider bunping to rel 2 and rebuild with fixed init.
-
-Revision 1.232 2004/09/12 12:16:07 arekm
-- update to 4.0.21; security fixes; new license exception which should mysql in pld more legal than before
-
-Revision 1.231 2004/08/25 09:40:38 arekm
-- ups
-
-Revision 1.230 2004/08/24 23:26:43 arekm
-- rel 4; these (not too critical sec bugs will be fixed in next release)
-
-Revision 1.229 2004/08/23 09:10:19 blues
-- SECURITY note.... IMPORTANT
-
-Revision 1.228 2004/08/18 23:36:05 arekm
-- add explanation about /var/lib/mysql/mysql.sock to avoid mistakes in future
-
-Revision 1.227 2004/08/18 23:26:39 arekm
-- reverted socket change, FIRST understand THEN change
-
-Revision 1.226 2004/08/18 23:24:30 gotar
-- mysql UNIX socket defaults to PLD default
-
-Revision 1.225 2004/08/14 22:26:10 arekm
-- better messages in trigger
-
-Revision 1.224 2004/08/14 17:32:03 arekm
-- rel 3.1; testing beggins again
-
-Revision 1.223 2004/08/13 20:45:50 arekm
-- rel 3; no one complained but there were positive reports
-
-Revision 1.222 2004/07/27 20:48:39 arekm
-- rel 2.6
-
-Revision 1.221 2004/07/27 20:12:41 arekm
-- remove wrong mysqld.conf, template is back
-
-Revision 1.220 2004/07/21 21:23:29 arekm
-- revert krzak change + add comment
-
-Revision 1.219 2004/07/21 19:17:24 krzak
-- /var/lib/mysql owned by mysql,mysql
-
-Revision 1.218 2004/07/16 12:35:26 blues
-- added monit file
-
-Revision 1.217 2004/06/29 00:12:54 arekm
-- it's GPL only, so no LGPL - linking exception isn't yet there
-
-Revision 1.216 2004/06/20 21:36:56 arekm
-- fix specflags (quotation here is buggy)
-
-Revision 1.215 2004/06/17 22:04:32 adamg
-- typo (doubled comma in attr) - pointed out by glen
-
-Revision 1.214 2004/06/07 19:57:03 blues
-- TODO removed, please test it
-
-Revision 1.213 2004/06/05 17:24:39 qboosh
-- script body for -p /sbin/ldconfig must be empty
-
-Revision 1.212 2004/06/04 22:01:28 ciesiel
-- rel. 2.3
-- added TODO
-
-Revision 1.211 2004/05/26 20:29:05 blues
-- small fix :)
-
-Revision 1.210 2004/05/26 20:06:17 blues
-- first portion of triggers
-
-Revision 1.209 2004/05/26 19:40:49 blues
-- started new clusters scheme. triggers are missing still
-
-Revision 1.208 2004/05/21 13:36:40 arekm
-- rel 2; mysql.init improved a little but still problematic
-
-Revision 1.207 2004/05/21 13:05:58 arekm
-- drop mysql/{db,innodb}
-
-Revision 1.206 2004/05/19 11:00:38 arekm
-- 4.0.20
-
-Revision 1.205 2004/05/09 05:31:53 ankry
-- BR fixes, rel. 3
-
-Revision 1.204 2004/05/07 22:03:28 qboosh
-- hack to build on amd64 (--with-named-thread-libs is not enough)
-- sorted configure options, release 2
-
-Revision 1.203 2004/04/28 14:45:00 arekm
-- rel 1
-
-Revision 1.202 2004/03/19 23:46:31 ankry
-- massive change: BR openssl-devel >= 0.9.7d
-
-Revision 1.201 2004/02/27 10:31:36 twittner
-- typo
-
-Revision 1.200 2004/02/17 22:27:03 grzegol
-- added nptl patch (without bcond because it doesn't break build with
- non nptl glibc) - patch by Tomasz Kowalczyk <kowalczt (at) ee.pw.edu.pl>
-
-Revision 1.199 2004/02/15 20:07:31 qboosh
-- fixed chown and added setsid usage in init, R: /usr/bin/setsid
-- strict internal deps
-
-Revision 1.198 2004/02/15 13:46:29 qboosh
-- removed obsolete comment
-
-Revision 1.197 2004/02/15 10:08:30 arekm
-- /var/lib/mysql is now root, root
-
-Revision 1.196 2004/02/15 10:02:08 arekm
-- 4.0.18, security problem resolved with adding one more dir in clusterdir
-
-Revision 1.195 2004/02/09 22:42:30 qboosh
-- added TODO about security vs clusters support (this is must-fix)
-
-Revision 1.194 2004/01/30 20:11:55 qboosh
-- fixed -doc perms
-
-Revision 1.193 2004/01/30 19:44:16 witekfl
-- added doc subpackage
-
-Revision 1.192 2004/01/27 12:02:06 qboosh
-- updated lang() for bokmaal (s/no/nb/)
-
-Revision 1.191 2003/12/25 11:14:36 arekm
-- updated to 4.0.17
-
-Revision 1.190 2003/11/28 20:50:08 qboosh
-- really? one more typo in the same line fixed ;>
-
-Revision 1.189 2003/11/28 18:24:51 deejay1
-- closed ticket 780 ;>
-- changelog cosmetics
-
-Revision 1.188 2003/11/07 09:58:07 qboosh
-- -bench R: perl(DBD::mysql) (closes BTS#766)
-
-Revision 1.187 2003/10/24 19:33:56 arekm
-- fixed source4 installation
-
-Revision 1.186 2003/10/24 16:13:49 arekm
-- mysqld.conf is now template only
-
-Revision 1.185 2003/10/23 20:23:46 arekm
-- remove patch6
-
-Revision 1.184 2003/10/23 18:30:42 arekm
-- updated to 4.0.16 (first version with proper init.d/mysql script)
-
-Revision 1.183 2003/10/04 17:21:45 qboosh
-- grr, fixed link patch, restored removed hunks
-- added mysql_fix_privilege_tables(1) man to -extras
-- moved mysql_config script from -extras to -devel
-- -devel R: zlib-devel
-
-Revision 1.182 2003/10/01 17:05:03 eothane
-- added mysql-admin-is-``mysql''-not-``root''.patch
-- removed mysql-3 series changelog
-
-Revision 1.181 2003/09/13 19:42:23 misi3k
-- tmp off dump_quote_db_names
-
-Revision 1.180 2003/09/12 17:19:01 misi3k
-- removed outdated sec patch
-
-Revision 1.179 2003/09/12 17:01:31 misi3k
-- updated to 4.0.15 NFY
-
-Revision 1.178 2003/09/11 22:17:18 blues
-- cosmetics
-
-Revision 1.177 2003/09/11 05:04:24 misi3k
-- rel 3
-- added secuirty patch
-Bug: buffer overflow - password field
-(more info in cvs log of mysql-buffer.patch)
-
-Revision 1.176 2003/08/23 22:28:24 wiget
-- added workaround for buggy gcc 3.3.1 on alpha
-- release 2
-
-Revision 1.175 2003/08/21 13:19:07 qboosh
-- -devel R: openssl-devel
-
-Revision 1.174 2003/08/19 14:08:16 qboosh
-- updated _noauto, moved to top so it's easier to find
-
-Revision 1.173 2003/08/12 22:32:50 ankry
-- cosmetics
-
-Revision 1.172 2003/07/30 09:11:28 blues
-- more macros
-
-Revision 1.171 2003/07/24 22:17:12 adamg
-- updated to 4.0.14
-
-Revision 1.170 2003/07/11 13:01:56 qboosh
-- added noproc patch, specify ps and kill arguments to configure
-
-Revision 1.169 2003/07/11 12:14:44 qboosh
-- added sql-cxx-pic patch (-fPIC as workaround for -rdynamic and C++ vtables on gcc3/alpha)
-- -fomit-frame-pointer only if no debug
-
-Revision 1.168 2003/07/11 07:58:54 qboosh
-- c++ patch requires gcc3 - added version to libstdc++-devel
-
-Revision 1.167 2003/06/30 09:26:27 qboosh
-- note about /proc
-
-Revision 1.166 2003/06/22 18:33:48 blues
-- added manfixes.patch - stollen from RH
-
-Revision 1.165 2003/06/21 06:15:39 blues
-- small cosmetics
-
-Revision 1.164 2003/06/09 18:57:09 arekm
-- updated to 4.0.13
-
-Revision 1.163 2003/05/25 20:15:03 adgor
-- Sources md5
-
-Revision 1.162 2003/05/25 05:50:56 misi3k
-- massive attack s/pld.org.pl/pld-linux.org/
-
-Revision 1.161 2003/05/17 06:30:02 pascalek
-- revert user changes
-
-Revision 1.160 2003/05/10 11:32:49 pascalek
-- Req user-mysql
-
-Revision 1.159 2003/04/24 18:12:45 misiek
-- isamlog -> isamlog.log
-
-Revision 1.158 2003/03/18 20:56:46 misiek
-- updated to final 4.0.12 (first PRODUCTION release of 4.0 series); removed obsolete patches
-
-Revision 1.157 2003/03/18 09:16:24 trojan
-- moved mysqlbug from libs to client (libs is not good place to keep
- any applications)
-
-Revision 1.156 2003/03/11 17:07:53 qboosh
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.300&r2=1.301&f=u
More information about the pld-cvs-commit
mailing list