summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mysql-5.5-layout.patch11
-rw-r--r--mysql-dev.spec16
2 files changed, 12 insertions, 15 deletions
diff --git a/mysql-5.5-layout.patch b/mysql-5.5-layout.patch
index 0c423af..503fda2 100644
--- a/mysql-5.5-layout.patch
+++ b/mysql-5.5-layout.patch
@@ -1,5 +1,5 @@
--- mysql-5.5.8/cmake/install_layout.cmake.layout 2010-12-03 18:58:26.000000000 +0100
-+++ mysql-5.5.8/cmake/install_layout.cmake 2010-12-18 10:36:52.631430079 +0100
++++ mysql-5.5.8/cmake/install_layout.cmake 2010-12-22 18:57:31.823379680 +0100
@@ -127,14 +127,15 @@
# RPM layout
#
@@ -19,3 +19,12 @@
SET(INSTALL_PLUGINDIR_RPM "lib/mysql/plugin")
ENDIF()
#
+@@ -148,7 +149,7 @@
+ SET(INSTALL_SHAREDIR_RPM "share")
+ SET(INSTALL_MYSQLSHAREDIR_RPM "share/mysql")
+ SET(INSTALL_MYSQLTESTDIR_RPM "share/mysql-test")
+-SET(INSTALL_SQLBENCHDIR_RPM "")
++SET(INSTALL_SQLBENCHDIR_RPM "share")
+ SET(INSTALL_SUPPORTFILESDIR_RPM "share/mysql")
+ #
+ SET(INSTALL_MYSQLDATADIR_RPM "/var/lib/mysql")
diff --git a/mysql-dev.spec b/mysql-dev.spec
index ad16847..ee2e8e0 100644
--- a/mysql-dev.spec
+++ b/mysql-dev.spec
@@ -1,5 +1,3 @@
-%global withbench 0
-
#global postver -rc
Name: mysql
Version: 5.5.8
@@ -157,7 +155,6 @@ 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.
-%if %{?withbench}
%package bench
Summary: MySQL benchmark scripts and data
@@ -169,7 +166,6 @@ Conflicts: MySQL-bench
MySQL is a multi-user, multi-threaded SQL database server. This
package contains benchmark scripts and data for use when benchmarking
MySQL.
-%endif
%package test
@@ -334,12 +330,6 @@ mkdir -p $RPM_BUILD_ROOT/var/run/mysqld
install -m 0755 -d $RPM_BUILD_ROOT/var/lib/mysql
install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysqld
install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/etc/my.cnf
-%if %{?withbench}
-mv $RPM_BUILD_ROOT/usr/sql-bench $RPM_BUILD_ROOT%{_datadir}/sql-bench
-%endif
-#mv $RPM_BUILD_ROOT/usr/mysql-test $RPM_BUILD_ROOT%{_datadir}/mysql-test
-# 5.1.32 forgets to install the mysql-test README file
-# install -m 0644 mysql-test/README $RPM_BUILD_ROOT%{_datadir}/mysql-test/README
mv ${RPM_BUILD_ROOT}%{_bindir}/mysqlbug ${RPM_BUILD_ROOT}%{_libdir}/mysql/mysqlbug
install -m 0755 scriptstub ${RPM_BUILD_ROOT}%{_bindir}/mysqlbug
@@ -606,11 +596,9 @@ fi
%{_mandir}/man1/mysql_client_test_embedded.1*
%{_mandir}/man1/mysqltest_embedded.1*
-%if %{?withbench}
%files bench
%defattr(-,root,root)
%{_datadir}/sql-bench
-%endif
%files test
%defattr(-,root,root)
@@ -622,9 +610,9 @@ fi
%changelog
* Fri Dec 17 2010 Remi Collet <RPMS@FamilleCollet.com> - 5.5.8-1
- Update to MySQL Community Server 5.5.8 GA
+- move from autotools to cmake
- remove EXCEPTIONS-CLIENT (no more provided upstream)
-- no mysql-bench for now
-- force soname to .161
+- force soname to .161 (compat-mysql51 provides .16)
* Wed Nov 10 2010 Remi Collet <RPMS@FamilleCollet.com> - 5.5.7-1
- Update to MySQL Community Server 5.5.7 RC