From bb911b7c9e512c0fe5871044bdcf636e81b5779e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Mon, 25 Feb 2019 16:09:34 +0100 Subject: [PATCH] Fix copying vmdk images from koji tasks --- ...typo-in-file-extension-for-vmdk-imag.patch | 29 +++++++++++++++++++ pungi.spec | 6 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-image-build-Fix-typo-in-file-extension-for-vmdk-imag.patch diff --git a/0001-image-build-Fix-typo-in-file-extension-for-vmdk-imag.patch b/0001-image-build-Fix-typo-in-file-extension-for-vmdk-imag.patch new file mode 100644 index 00000000..7ead7699 --- /dev/null +++ b/0001-image-build-Fix-typo-in-file-extension-for-vmdk-imag.patch @@ -0,0 +1,29 @@ +From 42a8965e87c5bc8e00cfe52db529080fcafb1135 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= +Date: Mon, 25 Feb 2019 16:06:59 +0100 +Subject: [PATCH] image-build: Fix typo in file extension for vmdk image +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Lubomír Sedlář +--- + pungi/phases/image_build.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pungi/phases/image_build.py b/pungi/phases/image_build.py +index 3fce8871..cca9eeb4 100644 +--- a/pungi/phases/image_build.py ++++ b/pungi/phases/image_build.py +@@ -33,7 +33,7 @@ EXTENSIONS = { + 'vagrant-virtualbox': ['vagrant-virtualbox.box'], + 'vagrant-vmware-fusion': ['vagrant-vmware-fusion.box'], + 'vdi': ['vdi'], +- 'vmdk': ['vdmk'], ++ 'vmdk': ['vmdk'], + 'vpc': ['vhd'], + 'vsphere-ova': ['vsphere.ova'], + } +-- +2.17.2 + diff --git a/pungi.spec b/pungi.spec index 4e868385..fe74c25c 100644 --- a/pungi.spec +++ b/pungi.spec @@ -2,7 +2,7 @@ Name: pungi Version: 4.1.33 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Distribution compose tool License: GPLv2 @@ -10,6 +10,7 @@ URL: https://pagure.io/pungi Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2 Patch0: 0001-update-iso-creation-for-ppc64le.patch Patch1: 0002-Make-the-Apple-HFS-compatibility-configurable.patch +Patch2: 0001-image-build-Fix-typo-in-file-extension-for-vmdk-imag.patch BuildRequires: python3-nose BuildRequires: python3-mock @@ -196,6 +197,9 @@ nosetests-3 --exe %{_bindir}/%{name}-wait-for-signed-ostree-handler %changelog +* Mon Feb 25 2019 Lubomír Sedlář - 4.1.33-3 +- Fix copying vmdk images from koji tasks + * Thu Feb 21 2019 Lubomír Sedlář - 4.1.33-2 - Make it possible to disable Apple/HFS compatibility on ppc64le