- merged from DEVEL

Changed files:
    mysql-c++.patch -> 1.4
    mysql.spec -> 1.149

diff --git a/mysql-c++.patch b/mysql-c++.patch
index 462aa1deea93dd6cbd3db0dafe7ad642d0d14cb4..01a703c0fa58588b4edf6ee5787337f404c94b5b 100644 (file)
--- a/mysql-c++.patch
+++ b/mysql-c++.patch
@@ -1,24 +1,24 @@
-diff -Nru mysql-3.23.54a.orig/isam/Makefile.am mysql-3.23.54a/isam/Makefile.am
---- mysql-3.23.54a.orig/isam/Makefile.am       Thu Dec  5 10:37:06 2002
-+++ mysql-3.23.54a/isam/Makefile.am    Fri Jan 17 14:42:23 2003
+diff -urN mysql-4.0.10-gamma.org/isam/Makefile.am mysql-4.0.10-gamma/isam/Makefile.am
+--- mysql-4.0.10-gamma.org/isam/Makefile.am    Thu Feb 13 19:29:15 2003
++++ mysql-4.0.10-gamma/isam/Makefile.am        Thu Feb 13 19:29:26 2003
 @@ -16,7 +16,7 @@
  
  INCLUDES =            @MT_INCLUDES@ -I$(srcdir)/../include -I../include 
  LDADD =                       @CLIENT_EXTRA_LDFLAGS@ libnisam.a ../mysys/libmysys.a \
 -                      ../dbug/libdbug.a ../strings/libmystrings.a
-+                      ../dbug/libdbug.a ../strings/libmystrings.a -lstdc++
++                      ../dbug/libdbug.a ../strings/libmystrings.a /usr/lib/libsupc++.la
  pkglib_LIBRARIES =    libnisam.a
  bin_PROGRAMS =                isamchk isamlog pack_isam
  isamchk_DEPENDENCIES= $(LIBRARIES)
-diff -Nru mysql-3.23.54a.orig/myisam/Makefile.am mysql-3.23.54a/myisam/Makefile.am
---- mysql-3.23.54a.orig/myisam/Makefile.am     Thu Dec  5 10:37:04 2002
-+++ mysql-3.23.54a/myisam/Makefile.am  Fri Jan 17 14:42:41 2003
+diff -urN mysql-4.0.10-gamma.org/myisam/Makefile.am mysql-4.0.10-gamma/myisam/Makefile.am
+--- mysql-4.0.10-gamma.org/myisam/Makefile.am  Wed Jan 29 12:29:22 2003
++++ mysql-4.0.10-gamma/myisam/Makefile.am      Thu Feb 13 19:32:55 2003
 @@ -19,7 +19,7 @@
  
- INCLUDES =            @MT_INCLUDES@ -I$(srcdir)/../include -I../include 
+ INCLUDES =            @MT_INCLUDES@ -I$(srcdir)/../include -I../include
  LDADD =                       @CLIENT_EXTRA_LDFLAGS@ libmyisam.a ../mysys/libmysys.a \
 -                      ../dbug/libdbug.a ../strings/libmystrings.a
-+                      ../dbug/libdbug.a ../strings/libmystrings.a -lstdc++
++                      ../dbug/libdbug.a ../strings/libmystrings.a /usr/lib/libsupc++.la
  pkglib_LIBRARIES =    libmyisam.a
  bin_PROGRAMS =                myisamchk myisamlog myisampack
  myisamchk_DEPENDENCIES=       $(LIBRARIES)

diff --git a/mysql.spec b/mysql.spec
index d568e3cfb3025f94b43bd30b36dfd7d02b4bd568..d605e8eaf75c567537a1931eb4cee8db9a406840 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,12 +1,6 @@
 #
 # Conditional build:
-# _with_innodb        - with InnoDB backend
-# _with_bdb           - with Berkeley DB backend
-# _with_small_fulltext - with fulltext indexes lowered from 4 to 3 characters
-#
-#%%define      _with_innodb    1
-#%%define      _with_bdb       1
-#%%define      _with_small_fulltext    1
+# _with_bdb - Berkeley DB support
 #
 %include       /usr/lib/rpm/macros.perl
 Summary:       MySQL: a very fast and reliable SQL database engine
@@ -18,38 +12,38 @@ Summary(uk):        MySQL - 
 Summary(zh_CN):        MySQLÊý¾Ý¿â·þÎñÆ÷
 Name:          mysql
 Group:         Applications/Databases
-Version:       3.23.55
-Release:       2
+Version:       4.0.10
+Release:       0.2
 License:       GPL/LGPL
-#http://www.mysql.com/Downloads/MySQL-3.23/mysql-3.23.54a.tar.gz shows mirrors list
-Source0:       ftp://gd.tuwien.ac.at/db/mysql/Downloads/MySQL-3.23/%{name}-%{version}.tar.gz
+Source0:       http://sunsite.icm.edu.pl/mysql/Downloads/MySQL-4.0/mysql-%{version}-gamma.tar.gz
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.logrotate
 Source4:       %{name}d.conf
-Patch0:                %{name}-info.patch
-Patch1:                %{name}-no_libnsl.patch
-Patch2:                %{name}-opt.patch
-Patch3:                %{name}-moreincludes.patch
-Patch4:                %{name}-info-res.patch
-Patch5:                %{name}-noproc.patch
-Patch6:                %{name}-fulltext-small.patch
-Patch7:                %{name}-c++.patch
-Patch8:                %{name}-lang.patch
+Patch0:                %{name}-libs.patch
+Patch1:                %{name}-libwrap.patch
+Patch2:                %{name}-lang.patch
+Patch3:                %{name}-c++.patch
+Patch4:                %{name}-no-my_inet_ntoa.patch
+Patch5:                %{name}-my_dir.patch
 Icon:          mysql.gif
 URL:           http://www.mysql.com/
 Requires:      %{name}-libs = %{version}
+#BuildRequires:        ORBit-devel
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: gcc-c++
+BuildRequires: libstdc++-devel
 BuildRequires: libtool
+BuildRequires: libwrap-devel
 BuildRequires: ncurses-devel >= 4.2
+BuildRequires: openssl-devel
 BuildRequires: perl-DBI
 BuildRequires: perl-devel >= 5.6.1
 BuildRequires: readline-devel >= 4.2
 BuildRequires: rpm-perlprov
 BuildRequires: texinfo
 BuildRequires: zlib-devel
+%{?_with_bdb:BuildRequires:    db3-devel}
 PreReq:                rc-scripts >= 0.2.0
 Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
@@ -67,11 +61,6 @@ Obsoletes:   mysql-server
 %define                _libexecdir     %{_sbindir}
 %define                _localstatedir  /var/lib/mysql
 
-%define                _gcc_ver        %(%{__cc} -dumpversion | cut -b 1)
-%if %{_gcc_ver} == 2
-%define                __cxx           "%{__cc}"
-%endif
-
 %description
 MySQL is a true multi-user, multi-threaded SQL (Structured Query
 Language) database server. SQL is the most popular database language
@@ -306,18 +295,13 @@ MySQL.
 ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÓËÒÉÐÔÉ ÔÁ ÄÁΦ ÄÌÑ ÏæÎËÉ ÐÒÏÄÕËÔÉ×ÎÏÓÔ¦ MySQL.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}-gamma
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%{?_with_small_fulltext:%patch6 -p0}
-%if %{_gcc_ver} > 2
-%patch7 -p1
-%endif
-%patch8 -p1
 
 %build
 rm -f missing
@@ -329,25 +313,29 @@ CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions -fomit-frame-pointer"
 CFLAGS="%{rpmcflags} -fomit-frame-pointer"
 %configure \
        -C \
-       %{!?debug:--without-debug} \
-       %{?_with_innodb:--with-innodb}  \
+       --with-pthread \
+       --with-raid \
+       --with-unix-socket-path=/var/lib/mysql/mysql.sock \
+       --with-mysqld-user=mysql \
+       --with-libwrap \
+       --with%{!?debug:out}-debug \
        %{?_with_bdb:--with-berkeley-db} \
-       --without-debug \
+       --with-embedded-server \
+       --with-vio \
+       --with-openssl \
+       --with-extra-charsets=all \
        --enable-shared \
        --enable-static \
-       --enable-assembler \
-       --with-pthread \
        --with-named-curses-libs="-lncurses" \
        --enable-assembler \
-       --with-raid \
-       --with-extra-charsets=all \
-       --with-mysqld-user=mysql \
-       --with-unix-socket-path=/var/lib/mysql/mysql.sock \
        --without-readline \
        --without-docs \
        --with-low-memory  \
        --with-comment="PLD Linux Distribution MySQL RPM" \
        --enable-thread-safe-client
+#      --with-mysqlfs
+
+echo -e "all:\ninstall:\nclean:\nlink_sources:\n" > libmysqld/examples/Makefile
 
 %{__make} benchdir=$RPM_BUILD_ROOT%{_datadir}/sql-bench
 %{__make} -C Docs mysql.info
@@ -359,10 +347,7 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
           $RPM_BUILD_ROOT%{_infodir} \
           $RPM_BUILD_ROOT/home/services/mysql
 
-%if %{?_with_innodb:1}%{!?_with_innodb:0}
 install -d $RPM_BUILD_ROOT/var/lib/mysql/innodb/{data,log}
-%endif
-
 %if %{?_with_bdb:1}%{!?_with_bdb:0}
 install -d $RPM_BUILD_ROOT/var/lib/mysql/bdb/{log,tmp}
 %endif
@@ -513,6 +498,7 @@ fi
 %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*