From b3500b1ac35d7d067364f14ccb2a53d0c249c735 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Apr 08 2016 12:39:04 +0000
Subject: 4.0.14 release


Signed-off-by: Dennis Gilmore <dennis@ausil.us>

---

diff --git a/bin/pungi b/bin/pungi
index 57b752c..ed9a299 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.0.13")
+        parser = OptionParser("%prog [--help] [options]", version="%prog 4.0.14")
 
         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 26826f3..b4fdae0 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.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.0.13'
+release = '4.0.14'
 
 # 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 7862228..a278e48 100644
--- a/pungi.spec
+++ b/pungi.spec
@@ -1,5 +1,5 @@
 Name:           pungi
-Version:        4.0.13
+Version:        4.0.14
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -48,10 +48,12 @@ A tool to create anaconda based installation trees/isos of a set of rpms.
 %{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-%{__install} -d $RPM_BUILD_ROOT/var/cache/pungi
-%{__install} -d $RPM_BUILD_ROOT/%{_mandir}/man8
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__install} -d %{buildroot}/var/cache/pungi
+%{__install} -d %{buildroot}/%{_mandir}/man8
+# this script has to be run by python3 and setup.py is too dumb
+sed -i 's|/usr/bin/python$|/usr/bin/python3|' %{buildroot}/%{_bindir}/pungi-pylorax-find-templates
 
 %files
 %defattr(-,root,root,-)
@@ -71,6 +73,15 @@ nosetests --exe --with-cov --cov-report html --cov-config tox.ini
 #cd tests && ./test_compose.sh
 
 %changelog
+* Fri Apr 08 2016 Dennis Gilmore <dennis@ausil.us> - 4.0.14-1
+- [ostree-installer] Copy all lorax outputs (lsedlar)
+- [ostree] Log to stdout as well (lsedlar)
+- [ostree-installer] Use separate directory for logs (lsedlar)
+- [ostree-installer] Put lorax output into work dir (lsedlar)
+- [ostree] Add test check for modified repo baseurl (lsedlar)
+- [ostree] Move cloning repo back to compose box (lsedlar)
+- [ostree] Mount ostree directory in koji (lsedlar)
+
 * Wed Apr 06 2016 Dennis Gilmore <dennis@ausil.us> - 4.0.13-1
 - [ostree] Enable marking ostree phase as failable (lsedlar)
 - [koji-wrapper] Initialize wrappers sequentially (lsedlar)
diff --git a/setup.py b/setup.py
index 2dd0813..446e8f6 100755
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ packages = sorted(packages)
 
 setup(
     name            = "pungi",
-    version         = "4.0.13",  # make sure it matches with pungi.__version__
+    version         = "4.0.14",  # make sure it matches with pungi.__version__
     description     = "Distribution compose tool",
     url             = "https://pagure.io/pungi",
     author          = "Dennis Gilmore",