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/bzip2.git#ace1f9660990ce46270b9c6b9a9b92774d5e4678

bzip2.spec

@@ -3,7 +3,7 @@
 Summary: A file compression utility
 Name: bzip2
 Version: 1.0.8
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: BSD
 URL: http://www.bzip.org/
 #Source0: http://www.bzip.org/%{version}/%{name}-%{version}.tar.gz
@@ -13,8 +13,10 @@ Source1: bzip2.pc
 Patch0: bzip2-saneso.patch
 Patch1: bzip2-cflags.patch
 Patch2: bzip2-ldflags.patch
+Patch3: man_gzipdiff.patch
 
 BuildRequires: gcc
+BuildRequires: make
 
 %description
 Bzip2 is a freely available, patent-free, high quality data compressor.
@@ -55,6 +57,7 @@ Static libraries for applications using the bzip2 compression format.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p2
 
 cp -a %{SOURCE1} .
 sed -i "s|^libdir=|libdir=%{_libdir}|" bzip2.pc
@@ -133,6 +136,13 @@ ln -s bzgrep.1 $RPM_BUILD_ROOT%{_mandir}/man1/bzfgrep.1
 %{_libdir}/pkgconfig/bzip2.pc
 
 %changelog
+* Fri Jan 29 2021 Jakub Martisko <jamartis@redhat.com> - 1.0.8-6
+- Minor man pgae update (gzip/bzip2 differnces)
+  resolves: #1897104
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Tue Jul 28 2020 Jakub Martisko <jamartis@redhat.com> - 1.0.8-4
 - Use make macros
 

man_gzipdiff.patch

@@ -0,0 +1,20 @@
+--- ./bzip2-1.0.8/bzip2.1	2019-07-13 19:50:05.000000000 +0200
++++ ./bzip2-1.0.8/bzip2.1.new	2021-01-29 11:51:04.091430407 +0100
+@@ -170,6 +170,17 @@
+ to try to recover data from
+ damaged files.
+ 
++Unlike 
++.I GNU gzip,
++.I bzip2 
++will not create a cascade of
++.I .bz2 
++suffixes even when using the 
++.I --force
++option:
++
++       filename.bz2    dose not become   filename.bz2.bz2
++
+ Return values: 0 for a normal exit, 1 for environmental problems (file
+ not found, invalid flags, I/O errors, &c), 2 to indicate a corrupt
+ compressed file, 3 for an internal consistency error (eg, bug) which