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/hivex.git#b1aec4ffd14ea029e9f7c804768b6f3b10d78cb5

hivex.spec

@@ -10,7 +10,7 @@
 
 Name:           hivex
 Version:        1.3.19
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Read and write Windows Registry binary hive files
 
 License:        LGPLv2
@@ -109,6 +109,7 @@ Requires:       pkgconfig
 for %{name}.
 
 
+%if !0%{?rhel}
 %package static
 Summary:        Statically linked library for %{name}
 Requires:       %{name} = %{version}-%{release}
@@ -117,6 +118,7 @@ Requires:       %{name} = %{version}-%{release}
 %description static
 %{name}-static contains the statically linked library
 for %{name}.
+%endif
 
 
 %if %{with ocaml}
@@ -186,6 +188,9 @@ ruby-%{name} contains Ruby bindings for %{name}.
     PYTHON=%{__python3} \
 %if !%{with ocaml}
     --disable-ocaml \
+%endif
+%if 0%{?rhel}
+    --disable-static \
 %endif
     %{nil}
 make V=1 INSTALLDIRS=vendor %{?_smp_mflags}
@@ -209,8 +214,9 @@ rm $RPM_BUILD_ROOT%{python3_sitearch}/libhivexmod.la
 
 
 %check
-# Disable some gnulib tests which fail on Arm and POWER (2020-07):
-for f in test-float test-perror2 test-strerror_r; do
+# Disable some gnulib tests which fail on Arm and POWER and S/390
+# (2020-07, 2020-12):
+for f in test-float test-perror2 test-pthread_sigmask1 test-strerror_r; do
     pushd gnulib/tests
     make $f
     rm -f $f
@@ -248,9 +254,11 @@ fi
 %{_libdir}/pkgconfig/hivex.pc
 
 
+%if !0%{?rhel}
 %files static
 %doc LICENSE
 %{_libdir}/libhivex.a
+%endif
 
 
 %if %{with ocaml}
@@ -293,6 +301,9 @@ fi
 
 
 %changelog
+* Thu Dec 03 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.19-5
+- Disable static subpackage on RHEL.
+
 * Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.19-4
 - OCaml 4.11.1 rebuild