.gitignore

@@ -1 +1 @@
-SOURCES/XML-XPath-1.44.tar.gz
+SOURCES/XML-XPath-1.48.tar.gz

.perl-XML-XPath.metadata

@@ -1 +1 @@
-5eacae3028a3c250a5667d4b56ba3678ccbd0ab9 SOURCES/XML-XPath-1.44.tar.gz
+9e2d46c4dc59493eba6eb987b9cea8c9a4a3878f SOURCES/XML-XPath-1.48.tar.gz

SPECS/perl-XML-XPath.spec

@@ -6,12 +6,12 @@
 %endif
 
 Name:           perl-XML-XPath
-Version:        1.44
+Version:        1.48
-Release:        11%{?dist}
+Release:        7%{?dist}
 Summary:        XPath parser and evaluator for Perl
-# XML/XPath.pm, XML/XPath/PerlSAX.pm, REAME: GPL+ or Artistic
+# XML/XPath.pm, XML/XPath/PerlSAX.pm, REAME: GPL-1.0-or-later OR Artistic-1.0-Perl
-# Others: Artistic 2.0
+# Others: Artistic-2.0
-License:        Artistic 2.0 and (GPL+ or Artistic)
+License:        Artistic-2.0 AND (GPL-1.0-or-later OR Artistic-1.0-Perl)
 URL:            https://metacpan.org/release/XML-XPath
 Source0:        https://cpan.metacpan.org/authors/id/M/MA/MANWAR/XML-XPath-%{version}.tar.gz
 
@@ -20,6 +20,7 @@ BuildRequires:  coreutils
 BuildRequires:  make
 BuildRequires:  perl-generators
 BuildRequires:  perl-interpreter
+BuildRequires:  perl(Config)
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
 BuildRequires:  perl(strict)
 BuildRequires:  perl(warnings)
@@ -29,11 +30,12 @@ BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(IO::File)
 BuildRequires:  perl(overload)
+BuildRequires:  perl(parent)
 BuildRequires:  perl(POSIX)
 BuildRequires:  perl(Scalar::Util)
-BuildRequires:  perl(vars)
 BuildRequires:  perl(XML::Parser) >= 2.23
 # Tests
+BuildRequires:  perl(constant)
 BuildRequires:  perl(lib)
 BuildRequires:  perl(open)
 BuildRequires:  perl(Path::Tiny) >= 0.076
@@ -45,24 +47,46 @@ BuildRequires:  perl(utf8)
 BuildRequires:  perl(CPAN::Meta)
 BuildRequires:  perl(Test::CPAN::Meta)
 BuildRequires:  perl(Test::CPAN::Meta::JSON)
+BuildRequires:  perl(Test::LeakTrace)
 %endif
 
-Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(POSIX)
-Requires:       perl(warnings)
 Requires:       perl(XML::Parser) >= 2.23
 
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(XML::Parser\\)$
 
+%if %{without perl_XML_XPath_enables_optional_test}
+%global __requires_exclude %{__requires_exclude}|^perl\\(Test::LeakTrace\\)
+%endif
+
+# perl-generators does not work properly for
+#   "use parent qw/-norequire XML::XPath::Node/;"
+%global __requires_exclude %{__requires_exclude}|^perl\\(-norequire\\)
+
 %description
 This module aims to comply exactly to the XPath specification at
 http://www.w3.org/TR/xpath and yet allow extensions to be added in the
 form of functions. Modules such as XSLT and XPointer may need to do
 this as they support functionality beyond XPath.
 
+%package tests
+Summary:        Tests for %{name}
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       perl-Test-Harness
+
+%description tests
+Tests from %{name}. Execute them
+with "%{_libexecdir}/%{name}/test".
+
 %prep
 %setup -q -n XML-XPath-%{version}
 
+# Help generators to recognize Perl scripts
+for F in t/*.t; do
+    perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F"
+    chmod +x "$F"
+done
+
 %build
 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
 %{make_build}
@@ -76,7 +100,20 @@ cat >> $RPM_BUILD_ROOT/%{_mandir}/man1/xpath.1 << EOF
 .so man3/XML::XPath.3pm
 EOF
 
+# Install tests
+mkdir -p %{buildroot}%{_libexecdir}/%{name}
+cp -a examples t %{buildroot}%{_libexecdir}/%{name}
+rm %{buildroot}%{_libexecdir}/%{name}/t/00load.t
+rm %{buildroot}%{_libexecdir}/%{name}/t/manifest.t
+rm %{buildroot}%{_libexecdir}/%{name}/t/meta-*.t
+cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
+#!/bin/sh
+cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf _NPROCESSORS_ONLN)"
+EOF
+chmod +x %{buildroot}%{_libexecdir}/%{name}/test
+
 %check
+export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}')
 make test
 
 %files
@@ -87,13 +124,52 @@ make test
 %{_mandir}/man1/xpath*
 %{_mandir}/man3/*.3*
 
+%files tests
+%{_libexecdir}/%{name}
+
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.44-11
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.48-7
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Bump release for June 2024 mass rebuild
-  Related: rhbz#1991688
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.48-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.48-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.48-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.48-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Aug 10 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.48-2
+- Filter invalid dependency 'perl(-norequire)'
+
+* Wed Aug 10 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.48-1
+- 1.48 bump
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.47-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue May 31 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.47-2
+- Perl 5.36 rebuild
+
+* Mon May 16 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.47-1
+* 1.47 bump
+
+* Fri May 13 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.46-1
+- 1.46 bump
+- Package tests
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.44-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.44-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.44-10
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.44-10
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Perl 5.34 rebuild
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.44-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild