summaryrefslogtreecommitdiffstats
path: root/mysql55.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-07-07 17:08:27 +0200
committerRemi Collet <fedora@famillecollet.com>2012-07-07 17:08:27 +0200
commitd81b273982dd282c51b0b3def0dd4310fb141554 (patch)
tree1257418cacbf49b8d4029d7dcd0b365346a8d5cb /mysql55.spec
parent810ddd3e6fead61410e42731827877fcb88361dd (diff)
MySQl: sync with rawhide
Diffstat (limited to 'mysql55.spec')
-rw-r--r--mysql55.spec19
1 files changed, 12 insertions, 7 deletions
diff --git a/mysql55.spec b/mysql55.spec
index b197c5c..d8cf1c7 100644
--- a/mysql55.spec
+++ b/mysql55.spec
@@ -1,6 +1,6 @@
Name: mysql
Version: 5.5.25a
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: MySQL client programs and shared libraries
Group: Applications/Databases
@@ -52,7 +52,6 @@ Patch8: mysql-dubious-exports.patch
Patch10: mysql-plugin-bool.patch
Patch11: mysql-s390-tsc.patch
Patch12: mysql-openssl-test.patch
-Patch13: mysqld-nowatch.patch
Patch14: mysql-va-list.patch
Patch15: mysql-netdevname.patch
Patch16: mysql-logrotate.patch
@@ -238,10 +237,6 @@ rm -f Docs/mysql.info
# When build with system openssl
%patch12 -p1
%endif
-%if 0%{?fedora} >= 15
-# for systemd
-%patch13 -p1
-%endif
%patch14 -p1
%patch15 -p1
%patch16 -p1
@@ -803,6 +798,16 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
+* Sat Jul 07 2012 Remi Collet <RPMS@FamilleCollet.com> - 5.5.25a-1.1
+- sync with rawhide
+
+* Fri Jul 6 2012 Tom Lane <tgl@redhat.com> 5.5.25a-1
+- Update to MySQL 5.5.25a, for various fixes described at
+ http://dev.mysql.com/doc/refman/5.5/en/news-5-5-25a.html
+ http://dev.mysql.com/doc/refman/5.5/en/news-5-5-25.html
+- Don't use systemd's Restart feature; rely on mysqld_safe instead
+Resolves: #832029
+
* Fri Jul 06 2012 Remi Collet <RPMS@FamilleCollet.com> - 5.5.25a-1
- update to MySQL 5.5.25a Community Server GA
http://dev.mysql.com/doc/refman/5.5/en/news-5-5-25a.html
@@ -811,7 +816,7 @@ fi
- Update to MySQL 5.5.24, for various fixes described at
http://dev.mysql.com/doc/refman/5.5/en/news-5-5-24.html
including the fix for CVE-2012-2122
- Resolves: #830680
+Resolves: #830680
- Tweak logrotate script to put the right permissions on mysqld.log
- Minor specfile fixes for recent packaging guidelines changes