Compare commits

...

No commits in common. "c8-stream-5.3" and "c9-beta" have entirely different histories.

4 changed files with 117 additions and 8 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/Scalar-List-Utils-1.53.tar.gz
SOURCES/Scalar-List-Utils-1.56.tar.gz

View File

@ -1 +1 @@
30b5861121ee98b8691b0b742011a91bfbdcde66 SOURCES/Scalar-List-Utils-1.53.tar.gz
225319a41a134172aff21f9b255770123655e3dd SOURCES/Scalar-List-Utils-1.56.tar.gz

View File

@ -0,0 +1,31 @@
From 0f0539f4781d83609afeb108992b9aa5d9eb0748 Mon Sep 17 00:00:00 2001
From: "Paul \"LeoNerd\" Evans" <leonerd@leonerd.org.uk>
Date: Sat, 11 Sep 2021 17:27:52 +0100
Subject: [PATCH] Add braces to fix implied indenting in XS(pairmap) (fixes
GH#58)
---
ListUtil.xs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ListUtil.xs b/ListUtil.xs
index 7b9ca45..11e3646 100644
--- a/ListUtil.xs
+++ b/ListUtil.xs
@@ -1177,11 +1177,12 @@ PPCODE:
stack[reti++] = newSVsv(PL_stack_base[i + 1]);
}
- if (spill)
+ if (spill) {
/* the POP_MULTICALL will trigger the SAVEFREESV above;
* keep it alive it on the temps stack instead */
SvREFCNT_inc_simple_void_NN(spill);
sv_2mortal((SV*)spill);
+ }
POP_MULTICALL;
--
2.44.0

View File

@ -1,12 +1,16 @@
Name: perl-Scalar-List-Utils
Epoch: 3
Version: 1.53
Release: 439%{?dist}
Epoch: 4
Version: 1.56
Release: 462%{?dist}
Summary: A selection of general-utility scalar and list subroutines
License: GPL+ or Artistic
URL: https://metacpan.org/release/Scalar-List-Utils
Source0: https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Scalar-List-Utils-%{version}.tar.gz
# Add braces to fix implied indenting in XS(pairmap)
# in upstream since 1.57
Patch0: Scalar-List-Utils-1.57-Add-braces-to-fix-implied-indenting-in-XS-pairmap-fi.patch
# Build
BuildRequires: coreutils
BuildRequires: findutils
BuildRequires: gcc
BuildRequires: make
@ -51,18 +55,49 @@ would be nice to have in the perl core, but the usage would not really be
high enough to warrant the use of a keyword, and the size so small such
that being individual extensions would be wasteful.
%package tests
Summary: Tests for %{name}
BuildArch: noarch
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: perl-Test-Harness
Requires: perl(Carp)
Requires: perl(IO::File)
Requires: perl(IO::Handle)
Requires: perl(threads)
Requires: perl(threads::shared)
Requires: perl(Tie::Handle)
%description tests
Tests from %{name}. Execute them
with "%{_libexecdir}/%{name}/test".
%prep
%setup -q -n Scalar-List-Utils-%{version}
%patch -P0 -p1
# 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 OPTIMIZE="%{optflags}" NO_PACKLIST=1
make %{?_smp_mflags}
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1 NO_PERLLOCAL=1
%{make_build}
%install
make pure_install DESTDIR=%{buildroot}
%{make_install}
find %{buildroot} -type f -name '*.bs' -size 0 -delete
%{_fixperms} %{buildroot}/*
# Install tests
mkdir -p %{buildroot}%{_libexecdir}/%{name}
cp -a t %{buildroot}%{_libexecdir}/%{name}
cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
#!/bin/sh
cd %{_libexecdir}/%{name} && exec prove -I . -r -j "$(getconf _NPROCESSORS_ONLN)"
EOF
chmod +x %{buildroot}%{_libexecdir}/%{name}/test
%check
make test
@ -74,7 +109,50 @@ make test
%{perl_vendorarch}/Sub*
%{_mandir}/man3/*
%files tests
%{_libexecdir}/%{name}
%changelog
* Wed Mar 20 2024 Jitka Plesnikova <jplesnik@redhat.com> - 4:1.56-462
- Fix implied indenting in XS
- Resolves: RHEL-28962
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4:1.56-461
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4:1.56-460
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Apr 01 2021 Jan Pazdziora <jpazdziora@redhat.com> - 4:1.56-459
- 1944897 - Rebase to upstream version 1.56.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4:1.55-458
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4:1.55-457
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4:1.55-456
- Increase release to favour standalone package
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4:1.55-456
- Increase epoch to favour standalone package
* Thu Apr 16 2020 Jan Pazdziora <jpazdziora@redhat.com> - 3:1.55-441
- 1823191 - Rebase to upstream version 1.55.
* Thu Feb 06 2020 Tom Stellard <tstellar@redhat.com> - 3:1.54-441
- Spec file cleanups: Use make_build and make_install macros
- https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make
- https://fedoraproject.org/wiki/Perl/Tips#ExtUtils::MakeMaker
* Mon Feb 03 2020 Jan Pazdziora <jpazdziora@redhat.com> - 3:1.54-440
- 1797333 - Rebase to upstream version 1.54.
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3:1.53-440
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Oct 25 2019 Jan Pazdziora <jpazdziora@redhat.com> - 3:1.53-439
- 1765091 - Rebase to upstream version 1.53.