[mash] make a patch against the tarball that does not fail rpms apply patches

[Dennis Gilmore]

commit 316166fff9e129579c79fc7b198949c8a052d6e2
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Wed Feb 11 04:26:51 2015 -0600

    make a patch against the tarball that does not fail rpms apply patches

 0001-update-the-mash-configs-for-rawhide.patch |   73 +++++++++---------------
 1 files changed, 27 insertions(+), 46 deletions(-)
---
diff --git a/0001-update-the-mash-configs-for-rawhide.patch b/0001-update-the-mash-configs-for-rawhide.patch
index c1dc76c..3caabc2 100644
--- a/0001-update-the-mash-configs-for-rawhide.patch
+++ b/0001-update-the-mash-configs-for-rawhide.patch
@@ -1,20 +1,7 @@
-From 42baaf6df456a62a1d256c352518d2e4127cad28 Mon Sep 17 00:00:00 2001
-From: Dennis Gilmore <dennis at ausil.us>
-Date: Tue, 10 Feb 2015 16:22:31 -0600
-Subject: [PATCH] update the mash configs for rawhide
-
----
- configs/rawhide.arm.mash  | 4 ++--
- configs/rawhide.mash      | 4 ++--
- configs/rawhide.ppc.mash  | 4 ++--
- configs/rawhide.s390.mash | 4 ++--
- 4 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/configs/rawhide.arm.mash b/configs/rawhide.arm.mash
-index e487304..1a3e939 100644
---- a/configs/rawhide.arm.mash
-+++ b/configs/rawhide.arm.mash
-@@ -6,7 +6,7 @@ repodata_path = %(arch)s/os/
+diff -uNr mash-0.6.13.orig/configs/rawhide.arm.mash mash-0.6.13/configs/rawhide.arm.mash
+--- mash-0.6.13.orig/configs/rawhide.arm.mash	2015-01-19 15:09:36.000000000 -0600
++++ mash-0.6.13/configs/rawhide.arm.mash	2015-02-11 04:25:28.251458745 -0600
+@@ -6,7 +6,7 @@
  source_path = source/SRPMS
  debuginfo = True
  multilib = False
@@ -22,19 +9,18 @@ index e487304..1a3e939 100644
 +tag = f23
  inherit = False
  strict_keys = False
- keys = 4B94091B, BA094068, A4D647E9, F8DF67E6, 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9, A29CB19C
-@@ -16,5 +16,5 @@ arches = aarch64
- delta = True
+ keys = A29CB19C
+@@ -17,5 +17,5 @@
  max_delta_rpm_age = 604800
+ delta_workers = 8
  # Change distro_tags as fedora-release version gets bumped
 -distro_tags = cpe:/o:fedoraproject:fedora:22 rawhide
 +distro_tags = cpe:/o:fedoraproject:fedora:23 rawhide
  hash_packages = True
-diff --git a/configs/rawhide.mash b/configs/rawhide.mash
-index 2e45d32..8969bc8 100644
---- a/configs/rawhide.mash
-+++ b/configs/rawhide.mash
-@@ -7,7 +7,7 @@ source_path = source/SRPMS
+diff -uNr mash-0.6.13.orig/configs/rawhide.mash mash-0.6.13/configs/rawhide.mash
+--- mash-0.6.13.orig/configs/rawhide.mash	2015-01-19 15:10:02.000000000 -0600
++++ mash-0.6.13/configs/rawhide.mash	2015-02-11 04:25:28.252458967 -0600
+@@ -7,7 +7,7 @@
  debuginfo = True
  multilib = True
  multilib_method = devel
@@ -42,19 +28,18 @@ index 2e45d32..8969bc8 100644
 +tag = f23
  inherit = False
  strict_keys = False
- keys = 246110C1, FB4b18E6, DE7F38BD, 22B3B81A, 1ACA3465, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9, 8E1431D5
-@@ -19,5 +19,5 @@ max_delta_rpm_size = 800000000
+ keys = 8E1431D5
+@@ -19,5 +19,5 @@
  max_delta_rpm_age = 604800
  delta_workers = 8
  # Change distro_tags as fedora-release version gets bumped
 -distro_tags = cpe:/o:fedoraproject:fedora:22 rawhide
 +distro_tags = cpe:/o:fedoraproject:fedora:23 rawhide
  hash_packages = True
-diff --git a/configs/rawhide.ppc.mash b/configs/rawhide.ppc.mash
-index 6223b88..e5a0744 100644
---- a/configs/rawhide.ppc.mash
-+++ b/configs/rawhide.ppc.mash
-@@ -6,7 +6,7 @@ repodata_path = %(arch)s/os/
+diff -uNr mash-0.6.13.orig/configs/rawhide.ppc.mash mash-0.6.13/configs/rawhide.ppc.mash
+--- mash-0.6.13.orig/configs/rawhide.ppc.mash	2015-01-19 15:10:46.000000000 -0600
++++ mash-0.6.13/configs/rawhide.ppc.mash	2015-02-11 04:25:28.252458967 -0600
+@@ -6,7 +6,7 @@
  source_path = source/SRPMS
  debuginfo = True
  multilib = False
@@ -62,19 +47,18 @@ index 6223b88..e5a0744 100644
 +tag = f23
  inherit = False
  strict_keys = False
- keys = 4B94091B, BA094068, A4D647E9, F8DF67E6, 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9, A29CB19C
-@@ -16,5 +16,5 @@ arches = ppc64le ppc64
- delta = True
+ keys = A29CB19C
+@@ -17,5 +17,5 @@
  max_delta_rpm_age = 604800
+ delta_workers = 8
  # Change distro_tags as fedora-release version gets bumped
 -distro_tags = cpe:/o:fedoraproject:fedora:22 rawhide
 +distro_tags = cpe:/o:fedoraproject:fedora:23 rawhide
  hash_packages = True
-diff --git a/configs/rawhide.s390.mash b/configs/rawhide.s390.mash
-index 8de136c..728f903 100644
---- a/configs/rawhide.s390.mash
-+++ b/configs/rawhide.s390.mash
-@@ -7,7 +7,7 @@ source_path = source/SRPMS
+diff -uNr mash-0.6.13.orig/configs/rawhide.s390.mash mash-0.6.13/configs/rawhide.s390.mash
+--- mash-0.6.13.orig/configs/rawhide.s390.mash	2015-01-19 15:10:53.000000000 -0600
++++ mash-0.6.13/configs/rawhide.s390.mash	2015-02-11 04:25:28.252458967 -0600
+@@ -7,7 +7,7 @@
  debuginfo = True
  multilib = True
  multilib_method = devel
@@ -82,14 +66,11 @@ index 8de136c..728f903 100644
 +tag = f23
  inherit = False
  strict_keys = False
- keys = 4B94091B, BA094068, A4D647E9, F8DF67E6, 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9, A29CB19C
-@@ -17,5 +17,5 @@ arches = s390 s390x
- delta = True
+ keys = A29CB19C
+@@ -18,5 +18,5 @@
  max_delta_rpm_age = 604800
+ delta_workers = 8
  # Change distro_tags as fedora-release version gets bumped
 -distro_tags = cpe:/o:fedoraproject:fedora:22 rawhide
 +distro_tags = cpe:/o:fedoraproject:fedora:23 rawhide
  hash_packages = True
--- 
-2.3.0
-