- c++ patch is obsolete, libstdc++ !needed (C++ operators are defined for gcc3)

Changed files:
    mysql-c++.patch -> 1.2
    mysql.spec -> 1.143

diff --git a/mysql-c++.patch b/mysql-c++.patch
deleted file mode 100644 (file)
index c2c526a..0000000
--- a/mysql-c++.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- mysql-3.23.46/isam/Makefile.am~    Sat Dec  1 21:49:57 2001
-+++ mysql-3.23.46/isam/Makefile.am     Sat Dec  1 22:00:07 2001
-@@ -18,7 +18,8 @@
- LDADD =                       $(CLIENT_EXTRA_LDFLAGS) libnisam.a \
-                       $(top_builddir)/mysys/libmysys.a \
-                       $(top_builddir)/dbug/libdbug.a \
--                      $(top_builddir)/strings/libmystrings.a
-+                      $(top_builddir)/strings/libmystrings.a \
-+                      -lstdc++
- pkglib_LIBRARIES =    libnisam.a
- bin_PROGRAMS =                isamchk isamlog pack_isam
- isamchk_DEPENDENCIES= $(LIBRARIES)
---- mysql-3.23.46/myisam/Makefile.am~  Sat Dec  1 22:01:10 2001
-+++ mysql-3.23.46/myisam/Makefile.am   Sat Dec  1 22:15:04 2001
-@@ -21,7 +21,8 @@
- LDADD =                       $(CLIENT_EXTRA_LDFLAGS) libmyisam.a \
-                       $(top_builddir)/mysys/libmysys.a \
-                       $(top_builddir)/dbug/libdbug.a \
--                      $(top_builddir)/strings/libmystrings.a
-+                      $(top_builddir)/strings/libmystrings.a \
-+                      -lstdc++
- pkglib_LIBRARIES =    libmyisam.a
- bin_PROGRAMS =                myisamchk myisamlog myisampack
- myisamchk_DEPENDENCIES=       $(LIBRARIES)

diff --git a/mysql.spec b/mysql.spec
index 5402a6749882936a1d40f1b2caae3765d5f075bc..b59cde6e70075aa24031c7eb235c2195e8a12889 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -24,14 +24,13 @@ Patch1:             %{name}-no_libnsl.patch
 Patch2:                %{name}-opt.patch
 Patch3:                %{name}-moreincludes.patch
 Patch4:                %{name}-info-res.patch
-Patch5:                %{name}-c++.patch
-Patch6:                %{name}-noproc.patch
+Patch5:                %{name}-noproc.patch
 Icon:          mysql.gif
 URL:           http://www.mysql.com/
 Requires:      %{name}-libs = %{version}
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: libstdc++-devel
+BuildRequires: gcc-c++
 BuildRequires: libtool
 BuildRequires: ncurses-devel >= 4.2
 BuildRequires: perl-DBI
@@ -48,17 +47,15 @@ Requires(pre):      /usr/sbin/useradd
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/userdel
 Requires(postun):      /usr/sbin/groupdel
-Provides:      msqlormysql MySQL-server
+Provides:      MySQL-server
+Provides:      msqlormysql
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     MySQL
 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
@@ -300,9 +297,7 @@ MySQL.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-# not needed for gcc 2.95, need to check if still needed with 3.2 and defines above
-#%patch5 -p1
-%patch6 -p1
+%patch5 -p1
 
 %build
 rm -f missing