|
@@ -27,22 +27,27 @@
|
|
|
Packager: tomop
|
|
|
Name: MySQL
|
|
|
Summary: MySQL: a very fast and reliable SQL database server
|
|
|
-Group: Applications/Databases
|
|
|
Version: %{mysql_version}
|
|
|
-Release: 1%{_dist_release}
|
|
|
-License: GPL
|
|
|
+Release: 2%{_dist_release}
|
|
|
+
|
|
|
+Group: Applications/Databases
|
|
|
+# exceptions allow client libraries to be linked with most open source SW,
|
|
|
+# not only GPL code.
|
|
|
+License: GPLv2 with exceptions
|
|
|
+URL: http://www.mysql.com/
|
|
|
+
|
|
|
Source: mysql-%{version}.tar.gz
|
|
|
# Don't depend on lib::mtr*
|
|
|
Source999: filter-requires-%{name}.sh
|
|
|
Patch0: mysql-5.1.44-jp-all.patch
|
|
|
-URL: http://www.mysql.com/
|
|
|
-Requires: fileutils sh-utils
|
|
|
-Provides: msqlormysql MySQL-server mysql
|
|
|
-Obsoletes: mysql MySQL5
|
|
|
+
|
|
|
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: perl, readline-devel
|
|
|
BuildRequires: gcc-c++, ncurses-devel, zlib-devel
|
|
|
BuildRequires: groff, libtool, automake
|
|
|
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
+Requires: fileutils sh-utils
|
|
|
+Provides: msqlormysql MySQL-server mysql
|
|
|
+Obsoletes: mysql MySQL5
|
|
|
|
|
|
# From the manual
|
|
|
%description
|
|
@@ -161,7 +166,7 @@ This package contains the MySQL regression test suite.
|
|
|
|
|
|
%package devel
|
|
|
Summary: MySQL - Development header files and libraries
|
|
|
-Group: Applications/Databases
|
|
|
+Group: Development/Libraries
|
|
|
Requires: %{libpkgname} = %{version}-%{release}
|
|
|
Provides: mysql-devel MySQL5-devel
|
|
|
Obsoletes: mysql-devel MySQL5-devel
|
|
@@ -173,8 +178,8 @@ necessary to develop MySQL client applications.
|
|
|
%{see_base}
|
|
|
|
|
|
%package -n %{libpkgname}
|
|
|
-Summary: MySQL - Shared libraries
|
|
|
-Group: Applications/Databases
|
|
|
+Summary: The shared libraries required for MySQL clients
|
|
|
+Group: System Environment/Libraries
|
|
|
%if %{?_dist_release}!="vl5"
|
|
|
Obsoletes: MySQL-shared < %{version}
|
|
|
%endif
|
|
@@ -184,28 +189,34 @@ This package contains the shared libraries (*.so*) which certain
|
|
|
languages and applications need to dynamically load and use MySQL.
|
|
|
|
|
|
|
|
|
-#%package embedded
|
|
|
-#Requires: %{name}-devel = %{version}-%{release}
|
|
|
-#Summary: MySQL - embedded library
|
|
|
-#Group: Applications/Databases
|
|
|
-#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
|
|
|
-#This package contains the MySQL server as an embedded library.
|
|
|
+%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.
|
|
|
|
|
|
-#The embedded MySQL server library makes it possible to run a
|
|
|
-#full-featured MySQL server inside the client application.
|
|
|
-#The main benefits are increased speed and more simple management
|
|
|
-#for embedded applications.
|
|
|
+%{see_base}
|
|
|
|
|
|
-#The API is identical for the embedded MySQL version and the
|
|
|
-#client/server version.
|
|
|
+%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}
|
|
|
|
|
|
-#%{see_base}
|
|
|
+%description embedded-devel
|
|
|
+MySQL is a multi-user, multi-threaded SQL database server. This
|
|
|
+package contains files needed for developing and testing with
|
|
|
+the embedded version of the MySQL server.
|
|
|
+
|
|
|
+%{see_base}
|
|
|
|
|
|
%prep
|
|
|
-%setup -T -a 0 -c -n mysql-%{mysql_version}
|
|
|
+%setup -q -T -a 0 -c -n mysql-%{mysql_version}
|
|
|
mv mysql-%{mysql_version} mysql-debug-%{mysql_version}
|
|
|
|
|
|
pushd mysql-debug-%{mysql_version}
|
|
@@ -217,7 +228,7 @@ automake --add-missing --copy
|
|
|
autoconf
|
|
|
popd
|
|
|
|
|
|
-%setup -D -T -a 0 -n mysql-%{mysql_version}
|
|
|
+%setup -q -D -T -a 0 -n mysql-%{mysql_version}
|
|
|
mv mysql-%{mysql_version} mysql-release-%{mysql_version}
|
|
|
|
|
|
pushd mysql-release-%{mysql_version}
|
|
@@ -244,7 +255,8 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
|
|
|
$* \
|
|
|
--with-mysqld-ldflags='-static' \
|
|
|
--with-client-ldflags='-static' \
|
|
|
- --with-zlib-dir=bundled \
|
|
|
+ --with-zlib-dir=/usr \
|
|
|
+ --enable-silent-rules \
|
|
|
--enable-assembler \
|
|
|
--enable-local-infile \
|
|
|
--with-fast-mutexes \
|
|
@@ -350,6 +362,19 @@ CFLAGS="$CFLAGS" \
|
|
|
CXXFLAGS="$CXXFLAGS" \
|
|
|
BuildMySQL --with-embedded-server
|
|
|
)
|
|
|
+
|
|
|
+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"
|
|
|
then
|
|
@@ -401,6 +426,11 @@ 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 \
|
|
@@ -729,25 +759,35 @@ fi
|
|
|
# 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/*
|
|
|
|
|
|
%files test
|
|
|
%defattr(-, root, root, 0755)
|
|
|
-%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_client_test_embedded.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/mysqltest_embedded.1*
|
|
|
-
|
|
|
-#%files embedded
|
|
|
-#%defattr(-, root, root, 0755)
|
|
|
-#%attr(644, root, root) %{_libdir}/mysql/libmysqld.a
|
|
|
+%{_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.*
|
|
|
+
|
|
|
+%files embedded-devel
|
|
|
+%defattr(-,root,root)
|
|
|
+%{_libdir}/mysql/libmysqld.so
|
|
|
+#{_libdir}/mysql/libmysqld.a
|
|
|
+%{_bindir}/mysql_client_test_embedded
|
|
|
+%{_bindir}/mysqltest_embedded
|
|
|
+%{_mandir}/man1/mysql_client_test_embedded.1*
|
|
|
+%{_mandir}/man1/mysqltest_embedded.1*
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Oct 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 5.1.44-2
|
|
|
+- made embedded package again
|
|
|
+
|
|
|
* Fri Mar 05 2010 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.1.44-1
|
|
|
- new upstream release.
|
|
|
- updated jp-patch.
|