summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mysql.5.5.39.spec (renamed from mysql.5.5.38.spec)11
-rw-r--r--mysql55.spec17
2 files changed, 20 insertions, 8 deletions
diff --git a/mysql.5.5.38.spec b/mysql.5.5.39.spec
index f29f669..c9ded68 100644
--- a/mysql.5.5.38.spec
+++ b/mysql.5.5.39.spec
@@ -24,13 +24,13 @@
%global mysql_vendor_2 Sun Microsystems, Inc.
%global mysql_vendor Oracle and/or its affiliates
-%global mysql_version 5.5.38
+%global mysql_version 5.5.39
%global mysqld_user mysql
%global mysqld_group mysql
%global mysqldatadir /var/lib/mysql
-%global release 1
+%global release 2
#
@@ -242,7 +242,7 @@
Name: MySQL%{product_suffix}
Summary: MySQL: a very fast and reliable SQL database server
Group: Applications/Databases
-Version: 5.5.38
+Version: 5.5.39
Release: %{release}%{?distro_releasetag:.%{distro_releasetag}}
Distribution: %{distro_description}
License: Copyright (c) 2000, 2014, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field.
@@ -511,6 +511,7 @@ mkdir debug
# XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
-DCMAKE_BUILD_TYPE=Debug \
+ -DENABLE_DTRACE=OFF \
-DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
-DFEATURE_SET="%{feature_set}" \
-DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
@@ -526,6 +527,7 @@ mkdir release
# XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DENABLE_DTRACE=OFF \
-DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
-DFEATURE_SET="%{feature_set}" \
-DCOMPILATION_COMMENT="%{compilation_comment_release}" \
@@ -1217,6 +1219,9 @@ echo "=====" >> $STATUS_HISTORY
# merging BK trees)
##############################################################################
%changelog
+* Wed Jul 02 2014 Bjorn Munch <bjorn.munch@oracle.com>
+- Disable dtrace unconditionally, breaks after we install Oracle dtrace
+
* Wed Oct 30 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
- Removed non gpl file docs/mysql.info from community packages
diff --git a/mysql55.spec b/mysql55.spec
index da85cc0..30bda25 100644
--- a/mysql55.spec
+++ b/mysql55.spec
@@ -3,14 +3,14 @@
%else
%global with_systemd 0
%endif
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
-%global with_dtrace 1
-%else
+#if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+#global with_dtrace 1
+#else
%global with_dtrace 0
-%endif
+#endif
Name: mysql
-Version: 5.5.38
+Version: 5.5.39
Release: 1%{?dist}
Summary: MySQL client programs and shared libraries
@@ -344,6 +344,8 @@ cmake . -DBUILD_CONFIG=mysql_release \
-DENABLED_LOCAL_INFILE=ON \
%if %{with_dtrace}
-DENABLE_DTRACE=ON \
+%else
+ -DENABLE_DTRACE=OFF \
%endif
-DWITH_EMBEDDED_SERVER=ON \
-DWITH_READLINE=ON \
@@ -842,6 +844,11 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
+* Sat Aug 2 2014 Remi Collet <RPMS@FamilleCollet.com> - 5.5.39-1
+- update to MySQL 5.5.39 Community Server GA
+ http://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-39.html
+- disable dtrace
+
* Mon Jun 2 2014 Remi Collet <RPMS@FamilleCollet.com> - 5.5.38-1
- update to MySQL 5.5.38 Community Server GA
http://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-38.html