From 36e7279a5ee3277f1d8b615878f81da246ae566b Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ra.ausil.us>
Date: Wed, 6 Apr 2016 17:44:40 -0500
Subject: [PATCH] 4.1.2 release

Signed-off-by: Dennis Gilmore <dennis@ra.ausil.us>
---
 bin/pungi   |  2 +-
 doc/conf.py |  2 +-
 pungi.spec  | 15 ++++++++++++++-
 setup.py    |  8 +++++---
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/bin/pungi b/bin/pungi
index 120352c1..ed2f7b40 100755
--- a/bin/pungi
+++ b/bin/pungi
@@ -200,7 +200,7 @@ if __name__ == '__main__':
     today = time.strftime('%Y%m%d', time.localtime())
 
     def get_arguments(config):
-        parser = OptionParser("%prog [--help] [options]", version="%prog 4.1.1")
+        parser = OptionParser("%prog [--help] [options]", version="%prog 4.1.2")
 
         def set_config(option, opt_str, value, parser, config):
             config.set('pungi', option.dest, value)
diff --git a/doc/conf.py b/doc/conf.py
index 3f95fe2f..932668c2 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -53,7 +53,7 @@ copyright = u'2016, Red Hat, Inc.'
 # The short X.Y version.
 version = '4.1'
 # The full version, including alpha/beta/rc tags.
-release = '4.1.1'
+release = '4.1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/pungi.spec b/pungi.spec
index 542c91fa..bca7f033 100644
--- a/pungi.spec
+++ b/pungi.spec
@@ -1,5 +1,5 @@
 Name:           pungi
-Version:        4.1.1
+Version:        4.1.2
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -65,6 +65,19 @@ nosetests --exe --with-cov --cov-report html --cov-config tox.ini
 #cd tests && ./test_compose.sh
 
 %changelog
+* Wed Apr 05 2016 Dennis Gilmore <dennis@ausil.us> - 4.1.2-1
+- Merge #257 `[ostree] Enable marking ostree phase as failable` (ausil)
+- [ostree] Enable marking ostree phase as failable (lsedlar)
+- [koji-wrapper] Initialize wrappers sequentially (lsedlar)
+- [createiso] Simplify code, test phase (lsedlar)
+- [createiso] Move runroot work to separate script (lsedlar)
+- [ostree] Use explicit work directory (lsedlar)
+- [ostree] Rename atomic to ostree (lsedlar)
+- [ostree] Move cloning config repo to chroot (lsedlar)
+- [ostree] Fix call to kobo.shortcuts.run (lsedlar)
+- [atomic] Stop creating the os directory (lsedlar)
+- [checksum] Add arch to file name (lsedlar)
+
 * Fri Apr 01 2016 Dennis Gilmore <dennis@ausil.us> - 4.1.1-1
 - install scripts (dennis)
 - Merge #242 `Fix wrong file permissions` (ausil)
diff --git a/setup.py b/setup.py
index 8b94e8d6..618cef60 100755
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ packages = sorted(packages)
 
 setup(
     name            = "pungi",
-    version         = "4.1.1",  # make sure it matches with pungi.__version__
+    version         = "4.1.2",  # make sure it matches with pungi.__version__
     description     = "Distribution compose tool",
     url             = "https://pagure.io/pungi",
     author          = "Dennis Gilmore",
@@ -34,12 +34,14 @@ setup(
 
     packages        = packages,
     scripts         = [
+        'bin/comps_filter',
         'bin/pungi',
         'bin/pungi-config-validate',
-        'bin/pungi-koji',
-        'bin/comps_filter',
+        'bin/pungi-createiso',
         'bin/pungi-fedmsg-notification',
+        'bin/pungi-koji',
         'bin/pungi-make-ostree',
+        'bin/pungi-pylorax-find-templates',
     ],
     data_files      = [
         ('/usr/share/pungi', glob.glob('share/*.xsl')),