- drop alpha patches

Changed files:
    mysql-alpha.patch -> 1.5
    mysql-sql-cxx-pic.patch -> 1.3
    mysql.spec -> 1.550

diff --git a/mysql-alpha.patch b/mysql-alpha.patch
deleted file mode 100644 (file)
index a93b2fd..0000000
--- a/mysql-alpha.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urbB mysql-5.0.15.org/ndb/src/kernel/blocks/dbtc/Makefile.am mysql-5.0.15/ndb/src/kernel/blocks/dbtc/Makefile.am
---- mysql-5.0.15.org/ndb/src/kernel/blocks/dbtc/Makefile.am    2005-10-17 03:27:27.000000000 +0200
-+++ mysql-5.0.15/ndb/src/kernel/blocks/dbtc/Makefile.am        2005-10-25 15:15:29.000000000 +0200
-@@ -1,5 +1,7 @@
- noinst_LIBRARIES = libdbtc.a
- 
-+CXXFLAGS += -O0
-+
- libdbtc_a_SOURCES = DbtcInit.cpp DbtcMain.cpp
- 
- include $(top_srcdir)/ndb/config/common.mk.am
-

diff --git a/mysql-sql-cxx-pic.patch b/mysql-sql-cxx-pic.patch
deleted file mode 100644 (file)
index 5e82fe8..0000000
--- a/mysql-sql-cxx-pic.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mysql-5.0.26/sql/Makefile.am~      2006-10-10 21:06:32.407695412 +0300
-+++ mysql-5.0.26/sql/Makefile.am       2006-10-11 00:35:45.939463254 +0300
-@@ -122,6 +122,7 @@
- DISTCLEANFILES =        lex_hash.h sql_yacc.output
- 
- AM_YFLAGS =           -d --debug --verbose
-+AM_CXXFLAGS = -fPIC
- 
- mysql_tzinfo_to_sql.cc:
-       rm -f mysql_tzinfo_to_sql.cc

diff --git a/mysql.spec b/mysql.spec
index b8da4345a8d9437f1d1f7e57cde079e5b4166fb8..ec57b1a3ab165a36967463809c5db11a84cd36af 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -61,14 +61,12 @@ Source14:   my.cnf
 Source15:      lib%{name}.version
 Patch2:                %{name}-c++.patch
 Patch3:                %{name}-info.patch
-Patch4:                %{name}-sql-cxx-pic.patch
 # from fedora
 Patch5:                %{name}-versioning.patch
 Patch6:                %{name}-system-users.patch
 Patch7:                %{name}-bug-34192.patch
 Patch8:                %{name}-client-config.patch
 Patch9:                %{name}-build.patch
-Patch10:       %{name}-alpha.patch
 Patch11:       %{name}-upgrade.patch
 Patch12:       %{name}-config.patch
 Patch14:       %{name}-bug-43594.patch
@@ -546,14 +544,6 @@ mv sphinx-*/mysqlse storage/sphinx
 %endif
 #%patch2 -p1 # NEEDS CHECK, which exact program needs -lc++
 %patch3 -p1
-%ifarch alpha
-# this is strange: mysqld functions for UDF modules are not explicitly defined,
-# so -rdynamic is used; in such case gcc3+ld on alpha doesn't like C++ vtables
-# in objects compiled without -fPIC
-%patch4 -p1
-# gcc 3.3.x ICE
-%patch10 -p1
-%endif
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1