From 4f76425c9f24bac9cf68e101bb7b5d10538fde8a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 8 Apr 2016 07:34:57 -0500 Subject: [PATCH] 4.1.3 release Signed-off-by: Dennis Gilmore --- bin/pungi | 2 +- doc/conf.py | 2 +- pungi.spec | 30 ++++++++++++++++++++++++------ setup.py | 2 +- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/bin/pungi b/bin/pungi index ed2f7b40..ef6642c2 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.2") + parser = OptionParser("%prog [--help] [options]", version="%prog 4.1.3") 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 932668c2..aeffc4cb 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.2' +release = '4.1.3' # 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 d5d70fd3..373d1259 100644 --- a/pungi.spec +++ b/pungi.spec @@ -1,5 +1,5 @@ Name: pungi -Version: 4.1.2 +Version: 4.1.3 Release: 1%{?dist} Summary: Distribution compose tool @@ -8,6 +8,12 @@ License: GPLv2 URL: https://fedorahosted.org/pungi Source0: https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name}-%{version}.tar.bz2 BuildRequires: python-nose, python-nose-cov, python-mock +BuildRequires: python-devel, python-setuptools, python2-productmd +BuildRequires: python-lockfile, kobo, kobo-rpmlib, python-kickstart, createrepo_c +BuildRequires: python-lxml, libselinux-python, yum-utils, lorax +BuildRequires: yum => 3.4.3-28, createrepo >= 0.4.11 +BuildRequires: gettext, git-core, cvs + Requires: createrepo >= 0.4.11 Requires: yum => 3.4.3-28 Requires: lorax >= 22.1 @@ -42,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,-) @@ -61,10 +69,20 @@ rm -rf $RPM_BUILD_ROOT ./tests/data/specs/build.sh python2 setup.py test nosetests --exe --with-cov --cov-report html --cov-config tox.ini -#TODO: enable compose test cd tests && ./test_compose.sh %changelog +* Fri Apr 08 2016 Dennis Gilmore - 4.1.3-1 +- enable the compose test (dennis) +- [ostree-installer] Copy all lorax outputs (lsedlar) +- [ostree] Log to stdout as well (lsedlar) +- [ostree-installer] Use separate directory for logs (lsedlar) +- Merge #260 `Maybe fix ostree?` (ausil) +- [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 05 2016 Dennis Gilmore - 4.1.2-1 - Merge #257 `[ostree] Enable marking ostree phase as failable` (ausil) - [ostree] Enable marking ostree phase as failable (lsedlar) diff --git a/setup.py b/setup.py index 618cef60..8eb3e273 100755 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ packages = sorted(packages) setup( name = "pungi", - version = "4.1.2", # make sure it matches with pungi.__version__ + version = "4.1.3", # make sure it matches with pungi.__version__ description = "Distribution compose tool", url = "https://pagure.io/pungi", author = "Dennis Gilmore",