From 8d8091e9e527ef1b17c6bb0726165bc1ff825713 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Apr 29 2015 18:33:13 +0000
Subject: blacklist php and httpd from being multilib rhbz#1217168 (dennis)


- Make blacklist/whitelist into config values. based on patch from Ralph Bean
  in rhbz#1082832 (dennis)
- Pass the config object into the multilib method objects. (rbean)
- Add configs for stg. (rbean)
- update the mash configs for rawhide (dennis)

---

diff --git a/0001-update-the-mash-configs-for-rawhide.patch b/0001-update-the-mash-configs-for-rawhide.patch
deleted file mode 100644
index 3caabc2..0000000
--- a/0001-update-the-mash-configs-for-rawhide.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-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
--tag = f22
-+tag = f23
- inherit = False
- strict_keys = False
- 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 -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
--tag = f22
-+tag = f23
- inherit = False
- strict_keys = False
- 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 -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
--tag = f22
-+tag = f23
- inherit = False
- strict_keys = False
- 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 -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
--tag = f22
-+tag = f23
- inherit = False
- strict_keys = False
- 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
diff --git a/mash.spec b/mash.spec
index 778ba1b..7e35965 100644
--- a/mash.spec
+++ b/mash.spec
@@ -1,14 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mash
-Version:        0.6.13
-Release:        2%{?dist}
+Version:        0.6.14
+Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://fedorahosted.org/releases/m/a/mash/
 Source0:        http://fedorahosted.org/releases/m/a/mash/%{name}-%{version}.tar.gz
-Patch0:		0001-update-the-mash-configs-for-rawhide.patch
 
 Requires:       yum, createrepo, koji
 Conflicts:	pungi < 1.0.0
@@ -23,7 +22,6 @@ any multlib RPMs that are necessary.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -45,6 +43,14 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/mash
 /var/cache/mash
 
 %changelog
+* Wed Apr 29 2015 Dennis Gilmore <dennis@ausil.us> - 0.6.14-1
+- blacklist php and httpd from being multilib rhbz#1217168 (dennis)
+- Make blacklist/whitelist into config values. based on patch from Ralph Bean
+  in rhbz#1082832 (dennis)
+- Pass the config object into the multilib method objects. (rbean)
+- Add configs for stg. (rbean)
+- update the mash configs for rawhide (dennis)
+
 * Tue Feb 10 2015 Dennis Gilmore <dennis@ausil.us> - 0.6.13-2
 - add patch moving rawhide to f23
 
diff --git a/sources b/sources
index e312a99..6dbfa1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b2f6572ab304dbe419f48c5798ef5747  mash-0.6.13.tar.gz
+8701d8f84ee9b8c929f70d740bb83974  mash-0.6.14.tar.gz