diff --git a/SPECS/cmake.spec b/SPECS/cmake.spec
index fd3d4c8..af1ecd3 100644
--- a/SPECS/cmake.spec
+++ b/SPECS/cmake.spec
@@ -65,7 +65,7 @@
 %{?rcsuf:%global versuf -%{rcsuf}}
 
 # For handling bump release by rpmdev-bumpspec and mass rebuild
-%global baserelease 1
+%global baserelease 4
 
 # Uncomment if building for EPEL
 #global name_suffix %%{major_version}
@@ -145,7 +145,7 @@ Provides: bundled(jsoncpp)
 BuildRequires:  jsoncpp-devel
 %endif
 %if 0%{?fedora} || 0%{?rhel} >= 7
-BuildRequires:  libarchive-devel
+BuildRequires:  libarchive-devel  >= 3.3.3
 %else
 BuildRequires:  libarchive3-devel
 %endif
@@ -237,6 +237,9 @@ This package contains common data-files for %{name}.
 Summary:        Documentation for %{name}
 BuildArch:      noarch
 
+# license files moved from the doc package to main package.
+Conflicts:      %{name} <= 3.20.1
+
 %description    doc
 This package contains documentation for %{name}.
 
@@ -443,6 +446,13 @@ NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup|CPack_RPM.DEBUGIN
 %ifarch s390x
 NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5"
 %endif
+
+# RunCMake.PrecompileHeaders test uses precompiled file presumably compiled with different compiler
+# that one of RHEL8 (GCC-8.3.1). See https://bugzilla.redhat.com/show_bug.cgi?id=1721553#c4
+%if 0%{?rhel} && 0%{?rhel} > 7
+NO_TEST="$NO_TEST|RunCMake.PrecompileHeaders"
+%endif
+
 # curl test may fail during bootstrap
 %if %{with bootstrap}
 NO_TEST="$NO_TEST|curl"
@@ -519,6 +529,15 @@ popd
 
 
 %changelog
+* Fri Jul 09 2021 sguelton@redhat.com - 3.20.2-4
+- Fix update (rhbz#1964407)
+
+* Thu Jun 17 2021 sguelton@redhat.com - 3.20.2-3
+- Fix rhbz#1964392 and rhbz#1964407
+
+* Fri Jun 04 2021 sguelton@redhat.com - 3.20.2-2
+- Minimal libarchive req
+
 * Thu May 20 2021 sguelton@redhat.com - 3.20.2-1
 - Sync with Fedora rawhide. (#1957947)