diff --git a/0001-Add-dropped-livemedia-phase.patch b/0001-Add-dropped-livemedia-phase.patch new file mode 100644 index 00000000..9dd4917c --- /dev/null +++ b/0001-Add-dropped-livemedia-phase.patch @@ -0,0 +1,31 @@ +From d58636851514844cdb794bfec65d74b0b29b5f1f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= +Date: Mon, 19 Jun 2017 08:58:53 +0200 +Subject: [PATCH] Add dropped livemedia phase +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +After the patch to ensure that all phases are stopped the livemedia +phase was apparently dropped by accident. + +Signed-off-by: Lubomír Sedlář +--- + bin/pungi-koji | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/bin/pungi-koji b/bin/pungi-koji +index 480618d..739d5b2 100755 +--- a/bin/pungi-koji ++++ b/bin/pungi-koji +@@ -400,6 +400,7 @@ def run_compose(compose, create_latest_link=True, latest_link_status=None): + pungi.phases.run_all([createiso_phase, + liveimages_phase, + image_build_phase, ++ livemedia_phase, + ostree_installer_phase, + osbs_phase]) + +-- +2.9.4 + diff --git a/pungi.spec b/pungi.spec index c59bcb33..ad923601 100644 --- a/pungi.spec +++ b/pungi.spec @@ -1,6 +1,6 @@ Name: pungi Version: 4.1.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Distribution compose tool Group: Development/Tools @@ -8,6 +8,7 @@ License: GPLv2 URL: https://pagure.io/pungi Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2 Patch0: 0001-koji-wrapper-Handle-failed-subtasks.patch +Patch1: 0001-Add-dropped-livemedia-phase.patch BuildRequires: python-nose, python-mock BuildRequires: python-devel, python-setuptools, python2-productmd >= 1.3 @@ -78,6 +79,7 @@ notification to Fedora Message Bus. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__python} setup.py build @@ -122,6 +124,9 @@ cd tests && ./test_compose.sh %{_bindir}/%{name}-compare-depsolving %changelog +* Mon Jun 19 2017 Lubomír Sedlář - 4.1.16-3 +- Add dropped livemedia phase + * Tue Jun 13 2017 Lubomír Sedlář - 4.1.16-2 - Handle failed subtasks when getting Koji results