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/perl-XML-XPath.git#376195ad9b1a0979b7a0969a78c6d667f833acf2

perl-XML-XPath.spec

@@ -1,6 +1,13 @@
+# Run optional tests
+%if ! (0%{?rhel})
+%bcond_without perl_XML_XPath_enables_optional_test
+%else
+%bcond_with perl_XML_XPath_enables_optional_test
+%endif
+
 Name:           perl-XML-XPath
 Version:        1.44
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        XPath parser and evaluator for Perl
 # XML/XPath.pm, XML/XPath/PerlSAX.pm, REAME: GPL+ or Artistic
 # Others: Artistic 2.0
@@ -34,9 +41,11 @@ BuildRequires:  perl(Test)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(utf8)
 # Optional tests
+%if %{with perl_XML_XPath_enables_optional_test}
 BuildRequires:  perl(CPAN::Meta)
 BuildRequires:  perl(Test::CPAN::Meta)
 BuildRequires:  perl(Test::CPAN::Meta::JSON)
+%endif
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(POSIX)
@@ -55,11 +64,11 @@ this as they support functionality beyond XPath.
 %setup -q -n XML-XPath-%{version}
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
-make %{?_smp_mflags}
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
+%{make_build}
 
 %install
-make pure_install DESTDIR=$RPM_BUILD_ROOT
+%{make_install}
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1/
@@ -79,6 +88,9 @@ make test
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Dec 15 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.44-8
+- Do not run optional test on RHEL
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.44-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild