From 7131c2bccc8ac51feef53ce2bf42d9132fb3b52b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 31 2020 09:41:56 +0000 Subject: import device-mapper-persistent-data-0.8.5-2.el7 --- diff --git a/SOURCES/dmpd-remove-pool-inactive-from-thin_trim-man-page.patch b/SOURCES/dmpd-remove-pool-inactive-from-thin_trim-man-page.patch new file mode 100644 index 0000000..cb32de9 --- /dev/null +++ b/SOURCES/dmpd-remove-pool-inactive-from-thin_trim-man-page.patch @@ -0,0 +1,17 @@ + man8/thin_trim.txt | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/man8/thin_trim.txt b/man8/thin_trim.txt +index 1d24a06..e19d8bd 100644 +--- a/man8/thin_trim.txt ++++ b/man8/thin_trim.txt +@@ -12,9 +12,6 @@ DESCRIPTION + OPTIONS + -h, --help Print help and exit. + -V, --version Print version information and exit. +- --pool-inactive Indicates you are aware the pool should be inactive. +- +- Suppresses a warning message and prompt. + + SEE ALSO + thin_dump(8), thin_repair(8), thin_restore(8), thin_rmap(8), thin_metadata_size(8) diff --git a/SOURCES/dmpd-space-map-noop-explicit-option-return.patch b/SOURCES/dmpd-space-map-noop-explicit-option-return.patch index 7133b77..149008a 100644 --- a/SOURCES/dmpd-space-map-noop-explicit-option-return.patch +++ b/SOURCES/dmpd-space-map-noop-explicit-option-return.patch @@ -1,12 +1,3 @@ -From 2d45ae3ca1dbd6ab04b8b99f627555c0092e7d4e Mon Sep 17 00:00:00 2001 -From: Joe Thornber -Date: Wed, 5 Jun 2019 11:07:28 +0100 -Subject: [PATCH] [space-map/noop] Be explicit about returning an optional - -Needed for older version of g++ - -(cherry picked from commit 5e5409f48b5403d2c6dffd9919b35ad77d6fb7b4) ---- persistent-data/space-maps/noop.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -23,6 +14,3 @@ index 500dae8..6f71290 100644 } bool count_possibly_greater_than_one(block_address b) const { --- -1.8.3.1 - diff --git a/SPECS/device-mapper-persistent-data.spec b/SPECS/device-mapper-persistent-data.spec index ae1c352..1d15982 100644 --- a/SPECS/device-mapper-persistent-data.spec +++ b/SPECS/device-mapper-persistent-data.spec @@ -5,7 +5,7 @@ Summary: Device-mapper Persistent Data Tools Name: device-mapper-persistent-data Version: 0.8.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: System Environment/Base URL: https://github.com/jthornber/thin-provisioning-tools @@ -13,6 +13,8 @@ URL: https://github.com/jthornber/thin-provisioning-tools Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz Patch0: device-mapper-persistent-data-avoid-strip.patch Patch1: dmpd-space-map-noop-explicit-option-return.patch +# BZ 1528261: +Patch2: dmpd-remove-pool-inactive-from-thin_trim-man-page.patch BuildRequires: autoconf, expat-devel, libaio-devel, libstdc++-devel, boost-devel Requires: expat @@ -29,6 +31,7 @@ snapshot eras %setup -q -n thin-provisioning-tools-%{version} %patch0 -p1 -b .avoid_strip %patch1 -p1 -b .explicit_option_return +%patch2 -p1 -b .remove_pool_inactive_option echo %{version}-%{release} > VERSION %build @@ -84,6 +87,9 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %{_sbindir}/thin_trim %changelog +* Tue Nov 19 2019 Marian Csontos - 0.8.5-2 +- Remove obsolete pool-inactive option from thin_trim man page. + * Mon Jun 10 2019 Marian Csontos - 0.8.5-1 - Additional fixes for thin_dump and thin_repair.