Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/cryptsetup.git#2e030eca12915844dabd8b4b54fdcf4ce92209d5

cryptsetup.spec

@@ -1,12 +1,13 @@
-Summary: A utility for setting up encrypted disks
+Summary: Utility for setting up encrypted disks
 Name: cryptsetup
 Version: 2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: https://gitlab.com/cryptsetup/cryptsetup
 BuildRequires: openssl-devel, popt-devel, device-mapper-devel
 BuildRequires: libuuid-devel, gcc, json-c-devel, libargon2-devel
 BuildRequires: libpwquality-devel, libblkid-devel
+BuildRequires: make
 Provides: cryptsetup-luks = %{version}-%{release}
 Obsoletes: cryptsetup-luks < 1.4.0
 Requires: cryptsetup-libs = %{version}-%{release}
@@ -22,7 +23,7 @@ The cryptsetup package contains a utility for setting up
 disk encryption using dm-crypt kernel module.
 
 %package devel
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 Summary: Headers and libraries for using encrypted file systems
 Provides: cryptsetup-luks-devel = %{version}-%{release}
@@ -74,33 +75,29 @@ chmod -x misc/dracut_90reencrypt/*
 
 %install
 %make_install
-rm -rf %{buildroot}/%{_libdir}/*.la
+rm -rf %{buildroot}%{_libdir}/*.la
 
 %find_lang cryptsetup
 
 %ldconfig_scriptlets -n cryptsetup-libs
 
 %files
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %doc AUTHORS FAQ docs/*ReleaseNotes
 %{_mandir}/man8/cryptsetup.8.gz
 %{_sbindir}/cryptsetup
 
 %files -n veritysetup
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_mandir}/man8/veritysetup.8.gz
 %{_sbindir}/veritysetup
 
 %files -n integritysetup
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_mandir}/man8/integritysetup.8.gz
 %{_sbindir}/integritysetup
 
 %files reencrypt
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %doc misc/dracut_90reencrypt
 %{_mandir}/man8/cryptsetup-reencrypt.8.gz
@@ -113,13 +110,15 @@ rm -rf %{buildroot}/%{_libdir}/*.la
 %{_libdir}/pkgconfig/libcryptsetup.pc
 
 %files libs -f cryptsetup.lang
-%{!?_licensedir:%global license %%doc}
 %license COPYING COPYING.LGPL
 %{_libdir}/libcryptsetup.so.*
 %{_tmpfilesdir}/cryptsetup.conf
 %ghost %attr(700, -, -) %dir /run/cryptsetup
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Thu Sep 03 2020 Milan Broz <gmazyland@gmail.com> - 2.3.4-1
 - Update to cryptsetup 2.3.4.
 - Fix for CVE-2020-14382 (#1874712)