summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-12-28 14:33:06 +0100
committerRemi Collet <fedora@famillecollet.com>2012-12-28 14:33:06 +0100
commitcac3bb3a21cd06aa1a2b2b731a182db1c27cc33d (patch)
tree3333902f18537ded75fe3941b46fb401c7e3df63
parent60c6254ac8ade7888e3b83208bea9097c1abf01f (diff)
mysql: sync with rawhide
-rw-r--r--mysql55.spec6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql55.spec b/mysql55.spec
index 9d7d7a4..3cfc528 100644
--- a/mysql55.spec
+++ b/mysql55.spec
@@ -102,6 +102,11 @@ Provides: mysql-client = %{version}-%{release}
%global __perl_requires %{SOURCE999}
%global __perllib_requires %{SOURCE999}
+# patch utility does automatically back-up of chunks that didn't apply
+# smoothly, but we don't want to create that files because they could be
+# included in RPM incorrectly
+%global _default_patch_flags --no-backup-if-mismatch
+
%description
MySQL is a multi-user, multi-threaded SQL database server. MySQL is a
client/server implementation consisting of a server daemon (mysqld)
@@ -815,6 +820,7 @@ fi
* Thu Dec 6 2012 Honza Horak <hhorak@redhat.com> 5.5.28-3
- Rebase patches to not leave backup files when not applied smoothly
+- Use --no-backup-if-mismatch to prevent including backup files
* Wed Dec 5 2012 Tom Lane <tgl@redhat.com> 5.5.28-2
- Add patch for CVE-2012-5611