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/scrub.git#7601bd4e8bd1f1e0f99f225aaf5cc753af5c7229

genrand-return-value.patch

@@ -0,0 +1,12 @@
+diff -ruN scrub-2.5.2.orig/src/genrand.c scrub-2.5.2/src/genrand.c
+--- scrub-2.5.2.orig/src/genrand.c	2012-06-21 00:00:27.000000000 +0200
++++ scrub-2.5.2/src/genrand.c	2020-11-27 13:57:59.866410480 +0100
+@@ -106,7 +106,7 @@
+                 buf[n] = result;
+             }
+ #endif
+-            return;
++            return 0;
+         }
+     }
+ 

scrub.spec

@@ -1,11 +1,14 @@
 Name:		scrub
 Version:	2.5.2
-Release:	17%{?dist}
+Release:	18%{?dist}
 Summary:	Disk scrubbing program
 License:	GPLv2+
 URL:		http://code.google.com/p/diskscrub/
 Source0:	http://diskscrub.googlecode.com/files/%{name}-%{version}.tar.bz2
 
+Patch0:		genrand-return-value.patch
+
+BuildRequires: make
 BuildRequires:  gcc
 %description
 Scrub writes patterns on files or disk devices to make
@@ -19,12 +22,14 @@ the file system is full, then scrubbed as in 2).
 %prep
 %setup -q
 
+%autopatch -p1
+
 %build
 %configure
-make %{?_smp_mflags}
+%{make_build}
 
 %install
-make DESTDIR=%{buildroot} install
+%{make_install}
 
 %files
 %doc DISCLAIMER COPYING
@@ -33,6 +38,9 @@ make DESTDIR=%{buildroot} install
 %{_mandir}/man1/scrub.1*
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild