From 320b718b8c4f0f644d6e041a22b6b55add6497b2 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 15 Dec 2020 11:06:58 +0000 Subject: [PATCH] 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-Twig.git#d7d3eca93b3b617cbaabb1d59a5a352ba196af3a --- perl-XML-Twig.spec | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/perl-XML-Twig.spec b/perl-XML-Twig.spec index 047de59..f39a9ae 100644 --- a/perl-XML-Twig.spec +++ b/perl-XML-Twig.spec @@ -1,13 +1,20 @@ +# Run optional test +%if ! (0%{?rhel}) +%bcond_without perl_XML_Twig_enables_optional_test +%else +%bcond_with perl_XML_Twig_enables_optional_test +%endif + Name: perl-XML-Twig Version: 3.52 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Perl module for processing huge XML documents in tree mode License: GPL+ or Artistic URL: https://metacpan.org/release/XML-Twig Source0: https://cpan.metacpan.org/authors/id/M/MI/MIROD/XML-Twig-%{version}.tar.gz BuildArch: noarch +BuildRequires: coreutils BuildRequires: expat >= 2.0.1 -BuildRequires: findutils BuildRequires: glibc-common BuildRequires: make BuildRequires: perl-interpreter @@ -42,6 +49,7 @@ BuildRequires: perl(lib) BuildRequires: perl(Test) BuildRequires: perl(Test::More) # Optional tests: +%if %{with perl_XML_Twig_enables_optional_test} BuildRequires: perl(IO::String) BuildRequires: perl(LWP) BuildRequires: perl(HTML::Entities) @@ -57,6 +65,7 @@ BuildRequires: perl(XML::Filter::BufferText) BuildRequires: perl(XML::Handler::YAWriter) BuildRequires: perl(XML::SAX::Writer) >= 0.39 BuildRequires: perl(XML::Simple) +%endif Requires: perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version)) Requires: perl(Encode) Requires: perl(HTML::TreeBuilder) >= 4.00 @@ -86,11 +95,11 @@ iconv -f iso88591 -t utf8 < Changes > Changes.utf8 && \ mv -f Changes.utf8 Changes %build -perl Makefile.PL -y INSTALLDIRS=perl NO_PACKLIST=1 -make %{?_smp_mflags} +perl Makefile.PL -y INSTALLDIRS=perl NO_PACKLIST=1 NO_PERLLOCAL=1 +%{make_build} %install -make pure_install DESTDIR=%{buildroot} +%{make_install} %{_fixperms} %{buildroot}/* %check @@ -104,6 +113,9 @@ make test %{_mandir}/man3/* %changelog +* Mon Dec 14 2020 Jitka Plesnikova - 3.52-15 +- Do not run optional test on RHEL + * Tue Jul 28 2020 Fedora Release Engineering - 3.52-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild