From f3d1617d2fe5b57f0633fde8cd742065942981ff Mon Sep 17 00:00:00 2001 From: Juerg Haefliger Date: Mon, 18 Mar 2019 11:00:25 +0100 Subject: [PATCH] Update package to upstream release 0.31 plus cleanups This commit includes the following changes from the update to upstream release 0.31: - mount-image-callback: mount with -o 'rw' or -o 'ro' (LP: #1663722) - mount-image-callback: run blockdev and udevadm settle on nbd devices. (LP: #1741096, 1741300) - mount-image-callback: Drop support for mounting lxd containers. (LP: #1715994) - growpart: fix bug that stopped GPT disks from being grown past 2TB. (LP: #1762748) - mount-image-callback: mention --help and -C/--cd-mountpoint in Usage - growpart: fix bug when resizing a middle partition with sgdisk (LP: #1706751) [Fred De Backer] - growpart: Resolve symbolic links before operating. [Kevin Locke] (LP: #1744406) - growpart: fix bug occurring if start sector and size were the same. [Lars Kellogg-Stedman] (LP: #1807171) - debian/control: drop Suggests on lxc1 - debian/tests/control: add test growpart-start-matches-size. - White space cleanup. Remove trailing space and tabs. Additionally: - Change the requirements from python2 to python3. - Drop the python2-paramiko requirement which was only used by the cloud-run-instances script which is no longer included. - Drop the cloud-run-instances manpage. Signed-off-by: Juerg Haefliger --- .gitignore | 1 + cloud-utils.spec | 30 ++++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7660cd0..8da51be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /cloud-utils-0.27-bzr216.tar.gz /cloud-utils-0.27.tar.gz /cloud-utils-0.30.tar.gz +/cloud-utils-0.31.tar.gz diff --git a/cloud-utils.spec b/cloud-utils.spec index de48db5..cd16c31 100644 --- a/cloud-utils.spec +++ b/cloud-utils.spec @@ -1,11 +1,11 @@ Summary: Cloud image management utilities Name: cloud-utils -Version: 0.30 -Release: 5%{?dist} +Version: 0.31 +Release: 1%{?dist} License: GPLv3 URL: https://launchpad.net/cloud-utils/ -Source0: https://launchpad.net/%{name}/trunk/0.3/+download/%{name}-%{version}.tar.gz +Source0: https://launchpad.net/%{name}/trunk/0.31/+download/%{name}-%{version}.tar.gz # Don't build the cloud-utils main package on EPEL architectures that don't # have qemu-img. Which means we need to make it a no-noarch package for EPEL @@ -26,8 +26,7 @@ Requires: gawk Requires: e2fsprogs Requires: euca2ools Requires: file -Requires: python2 -Requires: python2-paramiko +Requires: python3 Requires: qemu-img Requires: util-linux @@ -78,6 +77,9 @@ cp man/* $RPM_BUILD_ROOT/%{_mandir}/man1/ # Exclude Ubuntu-specific tools rm $RPM_BUILD_ROOT/%{_bindir}/*ubuntu* + +# Exclude the cloud-run-instances manpage +rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/cloud-run-instances.* %endif # Install the growpart binary and man page @@ -101,7 +103,6 @@ cp man/growpart.* $RPM_BUILD_ROOT/%{_mandir}/man1/ %{_bindir}/vcs-run %doc %{_mandir}/man1/cloud-publish-image.* %doc %{_mandir}/man1/cloud-publish-tarball.* -%doc %{_mandir}/man1/cloud-run-instances.* %doc %{_mandir}/man1/resize-part-image.* %doc %{_mandir}/man1/write-mime-multipart.* %doc %{_mandir}/man1/cloud-localds.* @@ -118,6 +119,23 @@ cp man/growpart.* $RPM_BUILD_ROOT/%{_mandir}/man1/ %changelog +* Mon Mar 18 2019 Juerg Haefliger - 0.31-1 +- Requires python3 instead of python2 [bz#1530224]. +- Drop python2-paramiko dependency (no longer required). +- Drop cloud-run-instances manpage (script no longer included). +- Rebase to upstream release 0.31 +- mount-image-callback: mount with -o 'rw' or -o 'ro' (LP: #1663722) +- mount-image-callback: run blockdev and udevadm settle on nbd devices. (LP: #1741096, 1741300) +- mount-image-callback: Drop support for mounting lxd containers. (LP: #1715994) +- growpart: fix bug that stopped GPT disks from being grown past 2TB. (LP: #1762748) +- mount-image-callback: mention --help and -C/--cd-mountpoint in Usage +- growpart: fix bug when resizing a middle partition with sgdisk (LP: #1706751) [Fred De Backer] +- growpart: Resolve symbolic links before operating. [Kevin Locke] (LP: #1744406) +- growpart: fix bug occurring if start sector and size were the same. [Lars Kellogg-Stedman] (LP: #1807171) +- debian/control: drop Suggests on lxc1 +- debian/tests/control: add test growpart-start-matches-size. +- White space cleanup. Remove trailing space and tabs. + * Thu Jan 31 2019 Fedora Release Engineering - 0.30-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild