[mysql] Use --no-backup-if-mismatch to prevent including backup files

Honza Horak hhorak at fedoraproject.org
Wed Dec 12 15:51:09 UTC 2012


commit c25e72f38d9334b42e5b222ad08b9f0c96e4b0e8
Author: Honza HorĂ¡k <hhorak at redhat.com>
Date:   Wed Dec 12 16:50:50 2012 +0100

    Use --no-backup-if-mismatch to prevent including backup files

 mysql.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index cdfcf4f..a6facc5 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -81,6 +81,11 @@ Obsoletes: mysql-cluster < 5.1.44
 %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)
@@ -707,6 +712,7 @@ fi
 %changelog
 * Thu Dec  6 2012 Honza Horak <hhorak at 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 at redhat.com> 5.5.28-2
 - Add patch for CVE-2012-5611


More information about the scm-commits mailing list