- update to 5.1.21

Changed files:
    mysql-libs.patch -> 1.18
    mysql-upgrade.patch -> 1.5
    mysql.spec -> 1.384

diff --git a/mysql-libs.patch b/mysql-libs.patch
index bf5343883f5ddc98a84a87f76e1dfccd8197031c..9c47009c83c29c0556ef5462312b61a35c04f740 100644 (file)
--- a/mysql-libs.patch
+++ b/mysql-libs.patch
@@ -1,6 +1,6 @@
---- mysql-5.0.24/configure.in~ 2006-08-07 01:15:28.845040985 +0300
-+++ mysql-5.0.24/configure.in  2006-08-07 02:06:21.203404560 +0300
-@@ -737,18 +737,20 @@
+--- mysql-5.1.21-beta/configure.in~    2007-08-29 19:00:29.000000000 +0300
++++ mysql-5.1.21-beta/configure.in     2007-08-29 19:00:35.000000000 +0300
+@@ -754,9 +754,9 @@
  
  AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
  
@@ -10,11 +10,10 @@
 +AC_CHECK_FUNC(gethostbyname_r, [],
 +  [AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
 +     [AC_CHECK_LIB(nsl, gethostbyname_r)])])
+ AC_CHECK_LIB(mtmalloc, malloc)
  
  AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
--AC_CHECK_FUNC(yp_get_default_domain, ,
--  AC_CHECK_LIB(nsl, yp_get_default_domain))
- AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
+@@ -766,7 +766,11 @@
  # This may get things to compile even if bind-8 is installed
  AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
  # Check if crypt() exists in libc or libcrypt, sets LIBS if needed
@@ -22,11 +21,11 @@
 +save_LIBS="$LIBS"
 +AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"])
 +AC_SUBST(LIBCRYPT)
-+AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) 
++AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt]))
 +LIBS="$save_LIBS"
  
- # For sem_xxx functions on Solaris 2.6
- AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
+ # For the sched_yield() function on Solaris
+ AC_CHECK_FUNC(sched_yield, , AC_CHECK_LIB(posix4, sched_yield))
 --- mysql-5.0.21/libmysql_r/Makefile.am~       2006-05-02 16:55:15.179229923 +0300
 +++ mysql-5.0.21/libmysql_r/Makefile.am        2006-05-02 16:56:08.080408785 +0300
 @@ -32,7 +32,7 @@
@@ -38,15 +37,14 @@
  libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
  
  # This is called from the toplevel makefile
---- mysql-5.1.20-beta/sql/Makefile.am.org      2007-07-09 22:25:41.755403750 +0200
-+++ mysql-5.1.20-beta/sql/Makefile.am  2007-07-09 22:25:54.012712699 +0200
-@@ -38,7 +38,7 @@
+--- mysql-5.1.21-beta/sql/Makefile.am~ 2007-08-29 18:58:33.000000000 +0300
++++ mysql-5.1.21-beta/sql/Makefile.am  2007-08-29 19:01:33.000000000 +0300
+@@ -43,7 +43,7 @@
                        @pstack_libs@ \
                        @mysql_plugin_libs@ \
                        $(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
--                      $(yassl_libs) $(openssl_libs) \
-+                      $(yassl_libs) $(openssl_libs) @LIBCRYPT@ \
-                       @MYSQLD_EXTRA_LIBS@
+-                      $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
++                      $(yassl_libs) $(openssl_libs) @LIBCRYPT@ @MYSQLD_EXTRA_LIBS@
  
  noinst_HEADERS =      item.h item_func.h item_sum.h item_cmpfunc.h \
-
+                       item_strfunc.h item_timefunc.h \

diff --git a/mysql-upgrade.patch b/mysql-upgrade.patch
index 1d7ecf275b68b61da19d80b4d67323e02055cc2b..5c0c01a6711db606f3c21235c98f7b256c9114ed 100644 (file)
--- a/mysql-upgrade.patch
+++ b/mysql-upgrade.patch
@@ -1,9 +1,9 @@
---- mysql-5.1.18-beta/client/mysql_upgrade.c~  2007-05-29 01:42:34.215129171 +0300
-+++ mysql-5.1.18-beta/client/mysql_upgrade.c   2007-05-29 01:45:02.148469038 +0300
-@@ -33,7 +33,7 @@
- static char mysqlcheck_path[FN_REFLEN];
+--- mysql-5.1.21-beta/client/mysql_upgrade.c~  2007-08-29 19:02:11.000000000 +0300
++++ mysql-5.1.21-beta/client/mysql_upgrade.c   2007-08-29 22:38:46.000000000 +0300
+@@ -36,7 +36,7 @@
  
- static my_bool opt_force, opt_verbose;
+ static my_bool opt_force, opt_verbose, debug_info_flag, debug_check_flag;
+ static uint my_end_arg= 0;
 -static char *opt_user= (char*)"root";
 +static char *opt_user= (char*)"mysql";
  

diff --git a/mysql.spec b/mysql.spec
index 3f9a8868d8c428f1b0d53746224296cc05d587cc..da2b517652463521cefaf7ae14fb17395c5fb970 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -14,6 +14,7 @@
 %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
+%bcond_with    autodeps        # BR packages needed only for resolving deps
 #
 %include       /usr/lib/rpm/macros.perl
 Summary:       MySQL: a very fast and reliable SQL database engine
@@ -25,13 +26,13 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
-Version:       5.1.20
-Release:       1
+Version:       5.1.21
+Release:       0.1
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 #Source0:      http://mysql.dataphone.se/Downloads/MySQL-5.1/%{name}-%{version}-beta.tar.gz
 Source0:       http://mysql.tonnikala.org/Downloads/MySQL-5.1/%{name}-%{version}-beta.tar.gz
-# Source0-md5: 1a3883347040de3990c152d7aceabccb
+# Source0-md5: c8e428a526b21d53c494a75b0ee01ffb
 Source100:     http://www.sphinxsearch.com/downloads/sphinx-0.9.7-rc2.tar.gz
 # Source100-md5:       65daf0feb7e276fb3de0aba82cff1d3e
 Source1:       %{name}.init
@@ -58,7 +59,7 @@ Patch9:               %{name}-build.patch
 Patch10:       %{name}-alpha.patch
 Patch11:       %{name}-upgrade.patch
 #Patch12:      %{name}-NDB_CXXFLAGS.patch
-Patch13:       %{name}-min_max.patch
+#Patch13:      %{name}-min_max.patch
 #Patch14:      %{name}-bug-18156.patch
 Patch15:       %{name}-bug-27694.patch
 Patch16:       %{name}-bug-29082.patch
@@ -71,7 +72,7 @@ BuildRequires:        libtool
 %{?with_tcpd:BuildRequires:    libwrap-devel}
 BuildRequires: ncurses-devel >= 4.2
 %{?with_ssl:BuildRequires:     openssl-devel >= 0.9.7d}
-BuildRequires: perl-DBI
+%{?with_autodeps:BuildRequires:        perl-DBI}
 BuildRequires: perl-devel >= 1:5.6.1
 BuildRequires: readline-devel >= 4.2
 BuildRequires: rpm-perlprov >= 4.1-13
@@ -463,7 +464,7 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch9 -p1
 %patch11 -p1
 #%patch12 -p1 # OUTDATED?
-%patch13 -p1
+#%patch13 -p1 # RECHECK?
 #%patch14 -p1 # OUTDATED?
 %patch15 -p1
 %patch16 -p1
@@ -917,8 +918,8 @@ done
 %{_mandir}/man1/mysqlbinlog.1*
 %{_mandir}/man1/mysqldump.1*
 %{_mandir}/man1/mysqlimport.1*
-%{_mandir}/man1/mysqlmanagerc.1*
-%{_mandir}/man1/mysqlmanager-pwgen.1*
+#%{_mandir}/man1/mysqlmanagerc.1*
+#%{_mandir}/man1/mysqlmanager-pwgen.1*
 %{_mandir}/man1/mysqlshow.1*
 %{_mandir}/man1/mysqlslap.1*
 %{_mandir}/man8/mysqlmanager.8*