MySQL-5.5.15-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4643 ec354946-7b23-47d6-9f5a-488ba84defc7

M/MySQL/MySQL-vl.spec

@@ -15,8 +15,8 @@
 
 %define see_base For a description of MySQL see the base MySQL RPM or http://www.mysql.com
 
-%define mysql_version		5.1.56
-%define client_version		16
+%define mysql_version		5.5.15
+%define client_version		18
 
 %if %{?_dist_release}!="vl5"
 %define libpkgname libmysqlclient%{client_version}
@@ -28,7 +28,7 @@ Packager:	tomop
 Name: MySQL
 Summary:	MySQL: a very fast and reliable SQL database server
 Version:	%{mysql_version}
-Release:	3%{_dist_release}
+Release:	1%{_dist_release}
 
 Group:		Applications/Databases
 # exceptions allow client libraries to be linked with most open source SW,
@@ -39,15 +39,15 @@ URL:		http://www.mysql.com/
 Source:		mysql-%{version}.tar.gz
 # Don't depend on lib::mtr*
 Source998:	perl-requires-%{name}.sh
-Patch0:		mysql-5.1.54-jp-all.patch
+Patch0:		mysql-5.5.15-jp-all.patch
 
 # lib64 patch for vine
 Patch200:	pysql-5.1.44-lib64.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:  perl, readline-devel
+BuildRequires:  perl, readline-devel, libaio-devel
 BuildRequires:  gcc-c++, ncurses-devel, zlib-devel, openssl-devel
-BuildRequires:  groff, libtool, automake
+BuildRequires:  groff, cmake, bison
 Requires:	fileutils sh-utils
 Provides:	msqlormysql MySQL-server mysql
 Obsoletes:	mysql MySQL5
@@ -112,49 +112,6 @@ This package contains the standard MySQL clients and administration tools.
 
 %{see_base}
 
-%package ndb-storage
-Summary:	MySQL - ndbcluster storage engine
-Group:		Applications/Databases
-
-%description ndb-storage
-This package contains the ndbcluster storage engine. 
-It is necessary to have this package installed on all 
-computers that should store ndbcluster table data.
-Note that this storage engine can only be used in conjunction
-with the MySQL Max server.
-
-%{see_base}
-
-%package ndb-management
-Summary:	MySQL - ndbcluster storage engine management
-Group:		Applications/Databases
-
-%description ndb-management
-This package contains ndbcluster storage engine management.
-It is necessary to have this package installed on at least 
-one computer in the cluster.
-
-%{see_base}
-
-%package ndb-tools
-Summary:	MySQL - ndbcluster storage engine basic tools
-Group:		Applications/Databases
-
-%description ndb-tools
-This package contains ndbcluster storage engine basic tools.
-
-%{see_base}
-
-%package ndb-extra
-Summary:	MySQL - ndbcluster storage engine extra tools
-Group:		Applications/Databases
-
-%description ndb-extra
-This package contains some extra ndbcluster storage engine tools for the advanced user.
-They should be used with caution.
-
-%{see_base}
-
 %package test
 Requires: %{name}-client = %{version}-%{release} perl-DBI perl
 Summary: MySQL - Test suite
@@ -193,23 +150,22 @@ This package contains the shared libraries (*.so*) which certain
 languages and applications need to dynamically load and use MySQL.
 
 
-%package embedded
-Summary: MySQL as an embeddable library
-Group: System Environment/Libraries
-Obsoletes: mysql-embedded MySQL5-embedded
-Provides: mysql-embedded MySQL5-embedded
+#%package embedded
+#Summary: MySQL as an embeddable library
+#Group: System Environment/Libraries
+#Obsoletes: mysql-embedded MySQL5-embedded
+#Provides: mysql-embedded MySQL5-embedded
 
-%description embedded
-MySQL is a multi-user, multi-threaded SQL database server. This
-package contains a version of the MySQL server that can be embedded
-into a client application instead of running as a separate process.
+#%description embedded
+#MySQL is a multi-user, multi-threaded SQL database server. This
+#package contains a version of the MySQL server that can be embedded
+#into a client application instead of running as a separate process.
 
-%{see_base}
+#%{see_base}
 
 %package embedded-devel
 Summary: Development files for MySQL as an embeddable library
 Group: Development/Libraries
-Requires: %{name}-embedded = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
 
 %description embedded-devel
@@ -220,190 +176,80 @@ the embedded version of the MySQL server.
 %{see_base}
 
 %prep
-%setup -q -T -a 0 -c -n mysql-%{mysql_version}
-mv mysql-%{mysql_version} mysql-debug-%{mysql_version}
+%setup -q -n mysql-%{version}
 
-pushd mysql-debug-%{mysql_version}
-%patch0 -p1 -b .jp
-%if %{_lib} == lib64
-%patch200 -p0 -b .lib64
-%endif
-aclocal
-autoheader
-libtoolize --automake --force
-automake --add-missing --copy
-autoconf
-perl -pi -e 's/-Werror"/"/' configure
-popd
-
-%setup -q -D -T -a 0 -n mysql-%{mysql_version}
-mv mysql-%{mysql_version} mysql-release-%{mysql_version}
-
-pushd mysql-release-%{mysql_version}
 %patch0 -p1 -b .jp
-%if %{_lib} == lib64
-%patch200 -p0 -b .lib64
-%endif
-aclocal
-autoheader
-libtoolize --automake --force
-automake --add-missing --copy
-autoconf
-perl -pi -e 's/-Werror"/"/' configure
-popd
-
-%build
-
-BuildMySQL() {
-# The --enable-assembler simply does nothing on systems that does not
-# support assembler speedups.
-sh -c  "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
-	CC=\"${CC:-$MYSQL_BUILD_CC}\" \
-	CXX=\"${CXX:-$MYSQL_BUILD_CXX}\" \
-%ifarch x86_64
-	CFLAGS=\"$CFLAGS -fPIC\" \
-	CXXFLAGS=\"$CXXFLAGS -fPIC\" \
-%else
-	CFLAGS=\"$CFLAGS\" \
-	CXXFLAGS=\"$CXXFLAGS\" \
-%endif
-	LDFLAGS=\"$MYSQL_BUILD_LDFLAGS\" \
-	./configure \
- 	    $* \
-	    --with-mysqld-ldflags='-static' \
-	    --with-client-ldflags='-static' \
-	    --with-zlib-dir=/usr \
-            --enable-silent-rules \
-	    --enable-assembler \
-	    --enable-local-infile \
-	    --with-fast-mutexes \
-            --with-mysqld-user=%{mysqld_user} \
-            --with-unix-socket-path=/var/lib/mysql/mysql.sock \
-	    --with-pic \
-            --prefix=/ \
-	    --with-extra-charsets=all \
-            --exec-prefix=%{_exec_prefix} \
-            --libexecdir=%{_sbindir} \
-            --libdir=%{_libdir} \
-            --sysconfdir=%{_sysconfdir} \
-            --datadir=%{_datadir} \
-            --localstatedir=%{mysqldatadir} \
-            --infodir=%{_infodir} \
-            --includedir=%{_includedir} \
-            --mandir=%{_mandir} \
-	    --enable-thread-safe-client \
-	    --with-readline \
-		--with-innodb \
-		--with-ndbcluster \
-		--with-archive-storage-engine \
-		--with-csv-storage-engine \
-		--with-blackhole-storage-engine \
-		--with-federated-storage-engine \
-		--with-partition \
-		--with-big-tables \
-		--enable-shared \
-		--with-comment=\"VineLinux MySQL RPM\" \
-		--with-charset=utf8 \
-		--with-client-charset=utf8 \
-		--with-ssl=/usr \
-		"
- make %{?_smp_mflags}
-}
-# end of function definition "BuildMySQL"
-
-# Use the build root for temporary storage of the shared libraries.
-
-RBR=$RPM_BUILD_ROOT
+#%if %{_lib} == lib64
+#%patch200 -p0 -b .lib64
+#%endif
+#aclocal
+#autoheader
+#libtoolize --automake --force
+#automake --add-missing --copy
+#autoconf
+#perl -pi -e 's/-Werror"/"/' configure
 
-# Clean up the BuildRoot first
-[ "$RBR" != "/" ] && [ -d $RBR ] && rm -rf $RBR;
-mkdir -p $RBR%{_libdir}/mysql
 
-#
-# Use MYSQL_BUILD_PATH so that we can use a dedicated version of gcc
-#
-PATH=${MYSQL_BUILD_PATH:-/bin:/usr/bin}
-export PATH
+%build
 
-# Build the Debug binary.
+# Be strict about variables, bail at earliest opportunity, etc.
+set -eu
 
-# Use gcc for C and C++ code (to avoid a dependency on libstdc++ and
-# including exceptions into the code
-if [ -z "$CXX" -a -z "$CC" ]
-then
-	export CC="gcc"
-	export CXX="gcc"
-fi
+# Optional package files
+touch optional-files-devel
 
-# Prepare compiler flags
-CFLAGS=${MYSQL_BUILD_CFLAGS:-$RPM_OPT_FLAGS}
-CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti }
-
-##############################################################################
-#
-#  Build the debug version
-#
-##############################################################################
+export PATH=${MYSQL_BUILD_PATH:-$PATH}
+export CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
+export CXX=${MYSQL_BUILD_CXX:-${CXX:-gcc}}
+export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
+export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti}}
+export LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${LDFLAGS:-}}
+export CMAKE=${MYSQL_BUILD_CMAKE:-${CMAKE:-cmake}}
+export MAKE_JFLAG=${MYSQL_BUILD_MAKE_JFLAG:-}
 
+# Build full release
+mkdir release
 (
-# We are in a subshell, so we can modify variables just for one run.
-CFLAGS=`echo   " $CFLAGS "   | \
-    sed -e 's/ -O[0-9]* / /' -e 's/ -unroll2 / /' -e 's/ -ip / /' \
-        -e 's/^ //' -e 's/ $//'`
-CXXFLAGS=`echo " $CXXFLAGS " | \
-    sed -e 's/ -O[0-9]* / /' -e 's/ -unroll2 / /' -e 's/ -ip / /' \
-        -e 's/^ //' -e 's/ $//'`
-
-# Add -g and --with-debug.
-cd mysql-debug-%{mysql_version} &&
-CFLAGS="$CFLAGS" \
-CXXFLAGS="$CXXFLAGS" \
-BuildMySQL --with-debug
+  cd release
+  # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before
+  # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
+  ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
+           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+           -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
+           -DFEATURE_SET="community" \
+           -DCOMPILATION_COMMENT="VineLinux MySQL RPM" \
+           -DMYSQL_SERVER_SUFFIX="%{server_suffix}" \
+           -DWITH_PIC="ON" \
+           -DWITH_ZLIB="system" \
+           -DWITH_EMBEDDED_SERVER="ON" \
+           -DWITH_SSL="yes"
+  echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
+  make %{?_smp_mflags} VERBOSE=1
 )
 
-# We might want to save the config log file
-if test -n "$MYSQL_DEBUGCONFLOG_DEST"
-then
-  cp -fp mysql-debug-%{mysql_version}/config.log "$MYSQL_DEBUGCONFLOG_DEST"
-fi
-
-#(cd mysql-debug-%{mysql_version} ; make test-bt-debug)
-
-##############################################################################
-#
-#  Build the release binary
-#
-##############################################################################
+# Use the build root for temporary storage of the shared libraries.
+RBR=$RPM_BUILD_ROOT
 
-(cd mysql-release-%{mysql_version} &&
-CFLAGS="$CFLAGS" \
-CXXFLAGS="$CXXFLAGS" \
-BuildMySQL --with-embedded-server
-)
+# Clean up the BuildRoot first
+[ "$RBR" != "/" ] && [ -d "$RBR" ] && rm -rf "$RBR";
 
-pushd mysql-release-%{mysql_version}
-# regular build will make libmysqld.a but not libmysqld.so :-(
-mkdir libmysqld/work
-cd libmysqld/work
-ar -x ../libmysqld.a
-# remove object file to avoid multiple definition error (is it a bug?)
-rm -f libfederated_a-ha_federated.o
-gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o libmysqld.so.0.0.1 \
-	*.o \
-	-lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc
-popd
-
-# We might want to save the config log file
-if test -n "$MYSQL_CONFLOG_DEST"
+# For gcc builds, include libgcc.a in the devel subpackage (BUG 4921).  This
+# needs to be during build phase as $CC is not set during install.
+if "$CC" -v 2>&1 | grep '^gcc.version' >/dev/null 2>&1
 then
-  cp -fp  mysql-release-%{mysql_version}/config.log "$MYSQL_CONFLOG_DEST"
+  libgcc=`$CC $CFLAGS --print-libgcc-file`
+  if [ -f $libgcc ]
+  then
+    mkdir -p $RBR%{_libdir}/mysql
+#    install -m 644 $libgcc $RBR%{_libdir}/mysql/libmygcc.a
+#    echo "%{_libdir}/mysql/libmygcc.a" >>optional-files-devel
+  fi
 fi
 
-#(cd mysql-release-%{mysql_version} ; make test-bt)
-
+##############################################################################
 %install
 RBR=$RPM_BUILD_ROOT
-MBD=$RPM_BUILD_DIR/mysql-%{mysql_version}/mysql-release-%{mysql_version}
+MBD=$RPM_BUILD_DIR/mysql-%{mysql_version}
 
 rm -rf $RBR
 
@@ -417,65 +263,30 @@ install -d $RBR%{_mandir}
 install -d $RBR%{_sbindir}
 
 # Install all binaries 
-(cd $MBD && make install DESTDIR=$RBR benchdir_root=%{_datadir})
-# Old packages put shared libs in %{_libdir}/ (not %{_libdir}/mysql), so do
-# the same here.
-#mv $RBR/%{_libdir}/mysql/*.so* $RBR/%{_libdir}/
-
-rm -rf $RBR/mysql-test
-
-##############################################################################
-# Include libgcc.a in the devel subpackage (BUG 4921)
-if [ -z "$CXX" -a -z "$CC" ]
-then
-	export CC="gcc"
-	export CXX="gcc"
-fi
-
-if expr "$CC" : ".*gcc.*" > /dev/null ;
-then
-  libgcc=`$CC $CFLAGS --print-libgcc-file`
-  if [ -f $libgcc ]
-  then
-    %define have_libgcc 1
-    install -m 644 $libgcc $RBR%{_libdir}/mysql/libmygcc.a
-  fi
-fi
-
-##############################################################################
-
-# install libmysqld.so
-install -m 0755 $MBD/libmysqld/work/libmysqld.so.0.0.1 $RPM_BUILD_ROOT%{_libdir}/mysql/libmysqld.so.0.0.1
-ln -s libmysqld.so.0.0.1 $RPM_BUILD_ROOT%{_libdir}/mysql/libmysqld.so.0
-ln -s libmysqld.so.0 $RPM_BUILD_ROOT%{_libdir}/mysql/libmysqld.so
-
-# install "mysqld-debug"
-$MBD/libtool --mode=execute install -m 755 \
-                 $RPM_BUILD_DIR/mysql-%{mysql_version}/mysql-debug-%{mysql_version}/sql/mysqld \
-                 $RBR%{_sbindir}/mysqld-debug
-
-# install saved perror binary with NDB support (BUG#13740)
-install -m 755 $MBD/extra/perror $RBR%{_bindir}/perror
+# Install all binaries
+(
+  cd $MBD/release
+  make DESTDIR=$RBR install
+)
 
 # Install logrotate and autostart
-install -m 644 $MBD/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql
-install -m 755 $MBD/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
-
-# in RPMs, it is unlikely that anybody should use "sql-bench"
-rm -fr $RBR%{_datadir}/sql-bench
+install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql
+install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
 
 # Create a symlink "rcmysql", pointing to the init.script. SuSE users
 # will appreciate that, as all services usually offer this.
-ln -s %{_sysconfdir}/init.d/mysql $RPM_BUILD_ROOT%{_sbindir}/rcmysql
+ln -s %{_sysconfdir}/init.d/mysql $RBR%{_sbindir}/rcmysql
 
-# Touch the place where the my.cnf config file and mysqlmanager.passwd
-# (MySQL Instance Manager password file) might be located
+# Touch the place where the my.cnf config file might be located
 # Just to make sure it's in the file list and marked as a config file
 touch $RBR%{_sysconfdir}/my.cnf
-touch $RBR%{_sysconfdir}/mysqlmanager.passwd
 
-mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
-echo "%{_libdir}/mysql" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/libmysqlclient%{client_version}-%{_arch}.conf
+# Remove man pages we explicitly do not want to package, avoids 'unpackaged
+# files' warning.
+rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1*
+
+##############################################################################
+
 
 %pre server
 # Shut down a previously installed server first
@@ -545,12 +356,6 @@ sleep 2
 #scheduled service packs and more.  Visit www.mysql.com/enterprise for more
 #information." 
 
-%post ndb-storage
-mysql_clusterdir=/var/lib/mysql-cluster
-
-# Create cluster directory if needed
-if test ! -d $mysql_clusterdir; then mkdir -m 755 $mysql_clusterdir; fi
-
 %preun server
 if test $1 = 0
 then
@@ -588,9 +393,11 @@ fi
 %files server
 %defattr(-,root,root,0755)
 
-%doc mysql-release-%{mysql_version}/COPYING mysql-release-%{mysql_version}/README 
-%doc mysql-release-%{mysql_version}/support-files/my-*.cnf
-%doc mysql-release-%{mysql_version}/support-files/ndb-*.ini
+%doc COPYING README
+%doc Docs/ChangeLog
+%doc Docs/INFO_SRC*
+%doc release/Docs/INFO_BIN*
+%doc release/support-files/my-*.cnf
 
 %doc %attr(644, root, root) %{_infodir}/mysql.info*
 
@@ -600,15 +407,18 @@ fi
 %doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1*
 %doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1*
 %doc %attr(644, root, man) %{_mandir}/man1/myisampack.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_convert_table_format.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_extensions.1*
 %doc %attr(644, root, man) %{_mandir}/man8/mysqld.8*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqldumpslow.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_install_db.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_secure_installation.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_setpermission.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_upgrade.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlman.1*
-%doc %attr(644, root, man) %{_mandir}/man8/mysqlmanager.8*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
@@ -616,17 +426,10 @@ fi
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlbug.1*
 %doc %attr(644, root, man) %{_mandir}/man1/perror.1*
 %doc %attr(644, root, man) %{_mandir}/man1/replace.1*
-
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_convert_table_format.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_extensions.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_secure_installation.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_setpermission.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqldumpslow.1*
 %doc %attr(644, root, man) %{_mandir}/man1/resolve_stack_dump.1*
 %doc %attr(644, root, man) %{_mandir}/man1/resolveip.1*
 
 %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
-%ghost %config(noreplace,missingok) %{_sysconfdir}/mysqlmanager.passwd
 
 %attr(755, root, root) %{_bindir}/innochecksum
 %attr(755, root, root) %{_bindir}/my_print_defaults
@@ -636,7 +439,6 @@ fi
 %attr(755, root, root) %{_bindir}/myisampack
 %attr(755, root, root) %{_bindir}/mysql_convert_table_format
 %attr(755, root, root) %{_bindir}/mysql_fix_extensions
-%attr(755, root, root) %{_bindir}/mysql_fix_privilege_tables
 %attr(755, root, root) %{_bindir}/mysql_install_db
 %attr(755, root, root) %{_bindir}/mysql_secure_installation
 %attr(755, root, root) %{_bindir}/mysql_setpermission
@@ -655,12 +457,8 @@ fi
 %attr(755, root, root) %{_bindir}/resolveip
 
 %attr(755, root, root) %{_sbindir}/mysqld
-%attr(755, root, root) %{_sbindir}/mysqld-debug
-%attr(755, root, root) %{_sbindir}/mysqlmanager
 %attr(755, root, root) %{_sbindir}/rcmysql
-
-%dir %attr(755, root, root) %{_libdir}/mysql/plugin
-%attr(755, root, root) %{_libdir}/mysql/plugin/*.so*
+%attr(755, root, root) %{_libdir}/mysql/plugin/*.so
 
 %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
 %attr(755, root, root) %{_sysconfdir}/init.d/mysql
@@ -674,6 +472,8 @@ fi
 %attr(755, root, root) %{_bindir}/mysql_find_rows
 %attr(755, root, root) %{_bindir}/mysql_waitpid
 %attr(755, root, root) %{_bindir}/mysqlaccess
+# XXX: This should be moved to %{_sysconfdir}
+%attr(644, root, root) %{_bindir}/mysqlaccess.conf
 %attr(755, root, root) %{_bindir}/mysqladmin
 %attr(755, root, root) %{_bindir}/mysqlbinlog
 %attr(755, root, root) %{_bindir}/mysqlcheck
@@ -685,6 +485,7 @@ fi
 %doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_find_rows.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_waitpid.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqladmin.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlbinlog.1*
@@ -694,115 +495,49 @@ fi
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlshow.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlslap.1*
 
-%files ndb-storage
-%defattr(-,root,root,0755)
-%attr(755, root, root) %{_sbindir}/ndbd
-%doc %attr(644, root, man) %{_mandir}/man8/ndbd.8*
-
-%files ndb-management
-%defattr(-,root,root,0755)
-%attr(755, root, root) %{_sbindir}/ndb_mgmd
-%doc %attr(644, root, man) %{_mandir}/man8/ndb_mgmd.8*
-
-%files ndb-tools
-%defattr(-,root,root,0755)
-%attr(755, root, root) %{_bindir}/ndb_config
-%attr(755, root, root) %{_bindir}/ndb_desc
-%attr(755, root, root) %{_bindir}/ndb_error_reporter
-%attr(755, root, root) %{_bindir}/ndb_mgm
-%attr(755, root, root) %{_bindir}/ndb_print_backup_file
-%attr(755, root, root) %{_bindir}/ndb_print_schema_file
-%attr(755, root, root) %{_bindir}/ndb_print_sys_file
-%attr(755, root, root) %{_bindir}/ndb_restore
-%attr(755, root, root) %{_bindir}/ndb_select_all
-%attr(755, root, root) %{_bindir}/ndb_select_count
-%attr(755, root, root) %{_bindir}/ndb_show_tables
-%attr(755, root, root) %{_bindir}/ndb_size.pl
-%attr(755, root, root) %{_bindir}/ndb_test_platform
-%attr(755, root, root) %{_bindir}/ndb_waiter
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_config.1*
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_desc.1*
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_error_reporter.1*
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_mgm.1*
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_restore.1*
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_print_backup_file.1*
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_print_schema_file.1*
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_print_sys_file.1*
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_select_all.1*
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_select_count.1*
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_show_tables.1*
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_size.pl.1*
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_waiter.1*
-
-%files ndb-extra
-%defattr(-,root,root,0755)
-%attr(755, root, root) %{_bindir}/ndb_delete_all
-%attr(755, root, root) %{_bindir}/ndb_drop_index
-%attr(755, root, root) %{_bindir}/ndb_drop_table
-%attr(755, root, root) %{_sbindir}/ndb_cpcd
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_delete_all.1*
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_index.1*
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_table.1*
-%doc %attr(644, root, man) %{_mandir}/man1/ndb_cpcd.1*
-
-%files devel
+%files devel -f optional-files-devel
 %defattr(-, root, root, 0755)
-%doc mysql-release-%{mysql_version}/EXCEPTIONS-CLIENT
+%doc %attr(644, root, man) %{_mandir}/man1/comp_err.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*
 %attr(755, root, root) %{_bindir}/mysql_config
 %dir %attr(755, root, root) %{_includedir}/mysql
 %dir %attr(755, root, root) %{_libdir}/mysql
 %{_includedir}/mysql/*
 %{_datadir}/aclocal/mysql.m4
-%{_libdir}/mysql/libmysql*.so
-%{_libdir}/mysql/libndb*.so
-
-#%{_libdir}/mysql/libdbug.a
-#%{_libdir}/mysql/libheap.a
-%if %{have_libgcc}
-%{_libdir}/mysql/libmygcc.a
-%endif
-#%{_libdir}/mysql/libmyisam.a
-#%{_libdir}/mysql/libmyisammrg.a
-#%{_libdir}/mysql/libmysqlclient.a
-#%{_libdir}/mysql/libmysqlclient_r.a
-#%{_libdir}/mysql/libmystrings.a
-#%{_libdir}/mysql/libmysys.a
-#%{_libdir}/mysql/libndbclient.a
-#%{_libdir}/mysql/libvio.a
-#%{_libdir}/mysql/libz.a
+%{_libdir}/*.so
+%exclude %{_libdir}/*.a
 
 %files -n %{libpkgname}
 %defattr(-, root, root, 0755)
 # Shared libraries (omit for architectures that don't support them)
-%{_libdir}/mysql/libmysql*.so.*
-%{_libdir}/mysql/libndb*.so.*
-%exclude %{_libdir}/mysql/libmysqld.so.*
-/etc/ld.so.conf.d/*
+%{_libdir}/libmysql*.so.*
+#/etc/ld.so.conf.d/*
 
 %files test
 %defattr(-, root, root, 0755)
-%{_datadir}/mysql-test
-%{_bindir}/mysql_client_test
-%{_mandir}/man1/mysql_client_test.1*
-%{_mandir}/man1/mysql-stress-test.pl.1*
-%{_mandir}/man1/mysql-test-run.pl.1*
-
-%files embedded
-%defattr(-, root, root, 0755)
-%doc mysql-release-%{mysql_version}/{COPYING,EXCEPTIONS-CLIENT}
-%{_libdir}/mysql/libmysqld.so.*
+%attr(-, root, root) %{_datadir}/mysql-test
+%attr(755, root, root) %{_bindir}/mysql_client_test
+%attr(755, root, root) %{_bindir}/mysql_client_test_embedded
+%attr(755, root, root) %{_bindir}/mysqltest_embedded
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql-stress-test.pl.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql-test-run.pl.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test_embedded.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
 
 %files embedded-devel
 %defattr(-,root,root)
-%{_libdir}/mysql/libmysqld.so
-#{_libdir}/mysql/libmysqld.a
+#{_libdir}/libmysqld.a
 %{_bindir}/mysql_client_test_embedded
 %{_bindir}/mysqltest_embedded
-%{_mandir}/man1/mysql_client_test_embedded.1*
-%{_mandir}/man1/mysqltest_embedded.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test_embedded.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
 
 %changelog
+* Tue Aug 23 2011 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.5.15-1
+- new upstream release.
+- removed NDB cluster support.
+
 * Mon Apr 18 2011 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.1.56-3
 - Added "BR: zlib-devel" to MySQL-devel.