From 3a1ce1ea2d9262337fc2e8e98334c37f1efe8497 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Aug 31 2020 09:39:26 +0000
Subject: Rebase to rpm 4.16.0-rc1, run test-suite in parallel


---

diff --git a/.gitignore b/.gitignore
index 5ed553f..0ae831f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@
 /rpm-4.15.90-git14971.tar.bz2
 /rpm-4.16.0-beta1.tar.bz2
 /rpm-4.16.0-beta3.tar.bz2
+/rpm-4.16.0-rc1.tar.bz2
diff --git a/rpm.spec b/rpm.spec
index 8e28cf6..fcbf9f2 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -24,8 +24,8 @@
 %define rpmhome /usr/lib/rpm
 
 %global rpmver 4.16.0
-%global snapver beta3
-%global rel 2
+%global snapver rc1
+%global rel 1
 
 %global srcver %{rpmver}%{?snapver:-%{snapver}}
 %global srcdir %{?snapver:testing}%{!?snapver:rpm-%(echo %{rpmver} | cut -d'.' -f1-2).x}
@@ -40,7 +40,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}%{rel}%{?dist}.3
+Release: %{?snapver:0.%{snapver}.}%{rel}%{?dist}
 Url: http://www.rpm.org/
 Source0: http://ftp.rpm.org/releases/%{srcdir}/rpm-%{srcver}.tar.bz2
 %if %{with bdb} && %{with int_bdb}
@@ -393,7 +393,7 @@ rm -f $RPM_BUILD_ROOT/%{_fileattrsdir}/{perl*,python*}
 
 %if %{with check}
 %check
-make check || (cat tests/rpmtests.log; exit 1)
+make check TESTSUITEFLAGS=-j%{_smp_build_ncpus} || (cat tests/rpmtests.log; exit 1)
 %endif
 
 # Handle rpmdb rebuild service on erasure of old to avoid ordering issues
@@ -552,6 +552,10 @@ fi
 %doc doc/librpm/html/*
 
 %changelog
+* Mon Aug 31 2020 Panu Matilainen <pmatilai@redhat.com> - 4.16.0-0.rc1.1
+- Rebase to 4.16.0-rc1
+- Run test-suite in parallel
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.16.0-0.beta3.2.3
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 555ec08..e4b0b22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rpm-4.16.0-beta3.tar.bz2) = 20efa638a7fe85b1b4d3d42fb07172c20a1f3c62024a29e4184b67a2d52ff3f94a186f178e9a5bfee9bf6c826a1023995d970b5c0ddaffe8b61fd2c888b44032
+SHA512 (rpm-4.16.0-rc1.tar.bz2) = 9f1212cd2311b802f8078e57d3d201ddaa999c4c04d94ed1e4877bf6513ee5c041835d647597af6e29e9d3c4a2c4a2710e1ef0b703a5a5a00bda1877524bdbeb