From 469e09e7457b306baf30610ecf1670b3f0d63501 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Jul 10 2014 16:44:28 +0000
Subject: Update for f21 branching and f22 rawhide.


---

diff --git a/configs/rawhide.arm.mash b/configs/rawhide.arm.mash
index edc529b..fd2aa75 100644
--- a/configs/rawhide.arm.mash
+++ b/configs/rawhide.arm.mash
@@ -6,7 +6,7 @@ repodata_path = %(arch)s/os/
 source_path = source/SRPMS
 debuginfo = True
 multilib = False
-tag = f21
+tag = f22
 inherit = False
 strict_keys = False
 keys = 4B94091B, BA094068, A4D647E9, F8DF67E6, 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
@@ -16,5 +16,5 @@ arches = aarch64
 delta = True
 max_delta_rpm_age = 604800
 # Change distro_tags as fedora-release version gets bumped
-distro_tags = cpe:/o:fedoraproject:fedora:21 rawhide
+distro_tags = cpe:/o:fedoraproject:fedora:22 rawhide
 hash_packages = True
diff --git a/configs/rawhide.mash b/configs/rawhide.mash
index 69992c9..3bd32a1 100644
--- a/configs/rawhide.mash
+++ b/configs/rawhide.mash
@@ -7,7 +7,7 @@ source_path = source/SRPMS
 debuginfo = True
 multilib = True
 multilib_method = devel
-tag = f21
+tag = f22
 inherit = False
 strict_keys = False
 keys = 246110C1, FB4b18E6, DE7F38BD, 22B3B81A, 1ACA3465, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
@@ -19,5 +19,5 @@ max_delta_rpm_size = 800000000
 max_delta_rpm_age = 604800
 delta_workers = 8
 # Change distro_tags as fedora-release version gets bumped
-distro_tags = cpe:/o:fedoraproject:fedora:21 rawhide
+distro_tags = cpe:/o:fedoraproject:fedora:22 rawhide
 hash_packages = True
diff --git a/configs/rawhide.ppc.mash b/configs/rawhide.ppc.mash
index 70465b1..4b9b6f3 100644
--- a/configs/rawhide.ppc.mash
+++ b/configs/rawhide.ppc.mash
@@ -6,7 +6,7 @@ repodata_path = %(arch)s/os/
 source_path = source/SRPMS
 debuginfo = True
 multilib = False
-tag = f21
+tag = f22
 inherit = False
 strict_keys = False
 keys = 4B94091B, BA094068, A4D647E9, F8DF67E6, 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
@@ -16,5 +16,5 @@ arches = ppc64le ppc64
 delta = True
 max_delta_rpm_age = 604800
 # Change distro_tags as fedora-release version gets bumped
-distro_tags = cpe:/o:fedoraproject:fedora:21 rawhide
+distro_tags = cpe:/o:fedoraproject:fedora:22 rawhide
 hash_packages = True
diff --git a/configs/rawhide.s390.mash b/configs/rawhide.s390.mash
index db3aa67..859898e 100644
--- a/configs/rawhide.s390.mash
+++ b/configs/rawhide.s390.mash
@@ -7,7 +7,7 @@ source_path = source/SRPMS
 debuginfo = True
 multilib = True
 multilib_method = devel
-tag = f21
+tag = f22
 inherit = False
 strict_keys = False
 keys = 4B94091B, BA094068, A4D647E9, F8DF67E6, 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
@@ -17,5 +17,5 @@ arches = s390 s390x
 delta = True
 max_delta_rpm_age = 604800
 # Change distro_tags as fedora-release version gets bumped
-distro_tags = cpe:/o:fedoraproject:fedora:21 rawhide
+distro_tags = cpe:/o:fedoraproject:fedora:22 rawhide
 hash_packages = True
diff --git a/mash.py b/mash.py
index b829f5b..26ed4ac 100755
--- a/mash.py
+++ b/mash.py
@@ -23,7 +23,7 @@ import mash.config
     
 def main():
     usage = "usage: %prog [options] <configuration to build>"
-    parser = OptionParser(usage, version='%prog 0.6.10')
+    parser = OptionParser(usage, version='%prog 0.6.11')
     parser.add_option("-o","--outputdir",default="", dest="outputdir",
       help="output directory")
     parser.add_option("-c","--config", default="/etc/mash/mash.conf", dest="config",
diff --git a/mash.spec b/mash.spec
index e0d4210..f37208b 100644
--- a/mash.spec
+++ b/mash.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mash
-Version:        0.6.10
+Version:        0.6.11
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
+* Tue Jul 08 2014 Kevin Fenzi <kevin@scrye.com> 0.6.11-1
+- Update rawhide config for f22
+
 * Thu Jun 05 2014 Dennis Gilmore <dennis@ausil.us> - 0.6.10-1
 - fix up the Metadata class to have the correct paramaters
 
diff --git a/setup.py b/setup.py
index 99e0001..3d73d3c 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from distutils.core import setup
 import glob
 
 setup(name='mash',
-      version='0.6.10',
+      version='0.6.11',
       description='Build system -> repository tool',
       author='Dennis gilmore',
       author_email='dennis@ausil.us',