From dae6aa038463db2c18cf235df835e50012e6c0f0 Mon Sep 17 00:00:00 2001
From: "daniel.zatovic" <daniel.zatovic@gmail.com>
Date: Wed, 13 Jul 2022 16:14:22 +0200
Subject: [PATCH] Obsolete cryptsetup-reencrypt and add manual pages to spec
 file.

The cryptsetup-reencrypt utility is now replaced by reencrypt action.
New per-action manual pages have been added.
---
 misc/fedora/cryptsetup.spec | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/misc/fedora/cryptsetup.spec b/misc/fedora/cryptsetup.spec
index 0f651a3b..a504e66a 100644
--- a/misc/fedora/cryptsetup.spec
+++ b/misc/fedora/cryptsetup.spec
@@ -2,7 +2,7 @@
 
 Summary: Utility for setting up encrypted disks
 Name: cryptsetup
-Version: 2.4.0
+Version: 2.5.0
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: https://gitlab.com/cryptsetup/cryptsetup
@@ -13,9 +13,11 @@ BuildRequires: libpwquality-devel, libblkid-devel
 BuildRequires: make libssh-devel
 Requires: cryptsetup-libs = %{version}-%{release}
 Requires: libpwquality >= 1.2.0
+Obsoletes: %{name}-reencrypt <= %{version}
+Provides: %{name}-reencrypt = %{version}
 
 %global upstream_version %{version_no_tilde}
-Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-%{upstream_version}.tar.xz
+Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.5/cryptsetup-%{upstream_version}.tar.xz
 
 %description
 The cryptsetup package contains a utility for setting up
@@ -59,14 +61,6 @@ Requires: cryptsetup-libs = %{version}-%{release}
 The integritysetup package contains a utility for setting up
 disk integrity protection using dm-integrity kernel module.
 
-%package reencrypt
-Summary: A utility for offline reencryption of LUKS encrypted disks
-Requires: cryptsetup-libs = %{version}-%{release}
-
-%description reencrypt
-This package contains cryptsetup-reencrypt utility which
-can be used for offline reencryption of disk in situ.
-
 %prep
 %autosetup -n cryptsetup-%{upstream_version} -p 1
 
@@ -86,8 +80,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la
 
 %files
 %license COPYING
-%doc AUTHORS FAQ docs/*ReleaseNotes
+%doc AUTHORS FAQ.md docs/*ReleaseNotes
 %{_mandir}/man8/cryptsetup.8.gz
+%{_mandir}/man8/cryptsetup-*.8.gz
 %{_sbindir}/cryptsetup
 
 %files -n veritysetup
@@ -100,11 +95,6 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la
 %{_mandir}/man8/integritysetup.8.gz
 %{_sbindir}/integritysetup
 
-%files reencrypt
-%license COPYING
-%{_mandir}/man8/cryptsetup-reencrypt.8.gz
-%{_sbindir}/cryptsetup-reencrypt
-
 %files devel
 %doc docs/examples/*
 %{_includedir}/libcryptsetup.h