diff --git a/.gitignore b/.gitignore index 0ff1a86..b14e0dc 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ appliance-tools-004.5.tar.bz2 /appliance-tools-008.0.tar.bz2 /appliance-tools-009.0.tar.bz2 /appliance-tools-010.0.tar.bz2 +/appliance-tools-010.1.tar.bz2 diff --git a/0001-fix-subvolume-umount-path.patch b/0001-fix-subvolume-umount-path.patch deleted file mode 100644 index f97084b..0000000 --- a/0001-fix-subvolume-umount-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8ec9b36ea829630b66a10ecbe4fe736648a65860 Mon Sep 17 00:00:00 2001 -From: Davide Cavalca -Date: Sat, 11 Jul 2020 15:24:39 -0700 -Subject: [PATCH] fix subvolume umount path - ---- - appcreate/partitionedfs.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/appcreate/partitionedfs.py b/appcreate/partitionedfs.py -index 86e709c..a1597ea 100644 ---- a/appcreate/partitionedfs.py -+++ b/appcreate/partitionedfs.py -@@ -256,7 +256,7 @@ class PartitionedMount(Mount): - ordered += others - - for s in ordered: -- subprocess.call(['umount', s['mountpoint']]) -+ subprocess.call(['umount', "%s%s" % (self.mountdir, s['mountpoint'])]) - - for mp in self.unmountOrder: - if mp == 'swap': --- -2.26.2 - diff --git a/appliance-tools.spec b/appliance-tools.spec index 55ab82e..3d8b5d6 100644 --- a/appliance-tools.spec +++ b/appliance-tools.spec @@ -20,16 +20,13 @@ Name: appliance-tools Summary: Tools for building Appliances -Version: 010.0 -Release: 3%{?dist} +Version: 010.1 +Release: 1%{?dist} License: GPLv2 URL: https://pagure.io/appliance-tools Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2 -# Backports from upstream -Patch0001: 0001-fix-subvolume-umount-path.patch - # Ensure system deps are installed (rhbz#1409536) Requires: python%{python_pkgversion}-imgcreate %{?min_imgcrate_evr:>= %{min_imgcreate_evr}} Requires: python%{python_pkgversion}-progress @@ -76,6 +73,10 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{python_sitelib}/ec2convert/ %changelog +* Sun Aug 23 2020 Neal Gompa - 010.1-1 +- Update to 010.1 release +- Drop merged patches + * Mon Jul 27 2020 Fedora Release Engineering - 010.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 4cdcdc2..b4c72bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (appliance-tools-010.0.tar.bz2) = e6513211b43f8e2c8cf18194de0faaa58f45812eff3db404c2532b2c36c45a9bfd48b85e9f76ad6fc09135231f3aa6381ff38faa0bc5ef83b9e0842fbf6b248b +SHA512 (appliance-tools-010.1.tar.bz2) = 9136d0be5812c87b8816a47683ace1e28eacd5243d2a0e0a8eb2b862f80cc147945836a02378de503e0b2a41769527f90b4fb769fa47ae4a237a3614b565454e