From 83c690539e1561bd7dd1576ce0d0b7f831bd90bd Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 24 Mar 2023 12:58:58 +0100 Subject: [PATCH] 0.010 bump --- .gitignore | 1 + Lexical-Var-0.009-Fix-RT-101058.patch | 59 --------------------------- perl-Lexical-Var.spec | 17 ++++---- sources | 2 +- 4 files changed, 12 insertions(+), 67 deletions(-) delete mode 100644 Lexical-Var-0.009-Fix-RT-101058.patch diff --git a/.gitignore b/.gitignore index 587f0e1..5fa31fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /Lexical-Var-0.007.tar.gz /Lexical-Var-0.008.tar.gz /Lexical-Var-0.009.tar.gz +/Lexical-Var-0.010.tar.gz diff --git a/Lexical-Var-0.009-Fix-RT-101058.patch b/Lexical-Var-0.009-Fix-RT-101058.patch deleted file mode 100644 index 5df9972..0000000 --- a/Lexical-Var-0.009-Fix-RT-101058.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -rup Lexical-Var-0.009-ubeeQC-orig/lib/Lexical/Var.xs Lexical-Var-0.009-ubeeQC/lib/Lexical/Var.xs ---- Lexical-Var-0.009-ubeeQC-orig/lib/Lexical/Var.xs 2013-08-25 11:51:34.000000000 -0700 -+++ Lexical-Var-0.009-ubeeQC/lib/Lexical/Var.xs 2014-12-21 10:58:32.000000000 -0800 -@@ -62,7 +62,12 @@ typedef AV PAD; - #endif /* !COP_SEQ_RANGE_LOW */ - - #ifndef COP_SEQ_RANGE_LOW_set --# if PERL_VERSION_GE(5,9,5) -+# ifdef newPADNAMEpvn -+# define COP_SEQ_RANGE_LOW_set(sv,val) \ -+ do { (sv)->xpadn_low = (val); } while(0) -+# define COP_SEQ_RANGE_HIGH_set(sv,val) \ -+ do { (sv)->xpadn_high = (val); } while(0) -+# elif PERL_VERSION_GE(5,9,5) - # define COP_SEQ_RANGE_LOW_set(sv,val) \ - do { ((XPVNV*)SvANY(sv))->xnv_u.xpad_cop_seq.xlow = val; } while(0) - # define COP_SEQ_RANGE_HIGH_set(sv,val) \ -@@ -95,6 +100,12 @@ static SV *THX_newSV_type(pTHX_ svtype t - # define GV_NOTQUAL 0 - #endif /* !GV_NOTQUAL */ - -+#ifndef padnamelist_store -+ /* Note that the return values are different. If we ever call it in non- -+ void context, we would have to change it to *av_store. */ -+# define padnamelist_store av_store -+#endif -+ - /* - * scalar classification - * -@@ -460,13 +471,18 @@ static void THX_setup_pad(pTHX_ CV *comp - PADNAMELIST *padname = PadlistNAMES(padlist); - PAD *padvar = PadlistARRAY(padlist)[1]; - PADOFFSET ouroffset; -- SV *ourname, *ourvar; -+ PADNAME *ourname; -+ SV *ourvar; - HV *stash; - ourvar = *av_fetch(padvar, PadMAX(padvar) + 1, 1); - SvPADMY_on(ourvar); - ouroffset = PadMAX(padvar); -+#ifdef newPADNAMEpvn -+ ourname = newPADNAMEpvn(name, strlen(name)); -+#else - ourname = newSV_type(SVt_PADNAME); - sv_setpv(ourname, name); -+#endif - SvPAD_OUR_on(ourname); - stash = name[0] == '$' ? stash_lex_sv : - name[0] == '@' ? stash_lex_av : stash_lex_hv; -@@ -474,7 +490,7 @@ static void THX_setup_pad(pTHX_ CV *comp - COP_SEQ_RANGE_LOW_set(ourname, PL_cop_seqmax); - COP_SEQ_RANGE_HIGH_set(ourname, pad_max()); - PL_cop_seqmax++; -- av_store(padname, ouroffset, ourname); -+ padnamelist_store(padname, ouroffset, ourname); - #ifdef PadnamelistMAXNAMED - PadnamelistMAXNAMED(padname) = ouroffset; - #endif /* PadnamelistMAXNAMED */ diff --git a/perl-Lexical-Var.spec b/perl-Lexical-Var.spec index 0bbe181..fe874a9 100644 --- a/perl-Lexical-Var.spec +++ b/perl-Lexical-Var.spec @@ -2,14 +2,12 @@ %bcond_without perl_Lexical_Var_enables_optional_test Name: perl-Lexical-Var -Version: 0.009 -Release: 31%{?dist} +Version: 0.010 +Release: 1%{?dist} Summary: Static variables without name space pollution License: GPL-1.0-or-later OR Artistic-1.0-Perl URL: https://metacpan.org/release/Lexical-Var Source0: https://cpan.metacpan.org/modules/by-module/Lexical/Lexical-Var-%{version}.tar.gz -# Update code to work with Perl 5.21.x (CPAN RT#101058) -Patch0: Lexical-Var-0.009-Fix-RT-101058.patch # Build BuildRequires: coreutils BuildRequires: findutils @@ -22,12 +20,15 @@ BuildRequires: perl(Module::Build) BuildRequires: perl(strict) BuildRequires: perl(warnings) # Run-Time -BuildRequires: perl(Lexical::SealRequireHints) >= 0.006 +BuildRequires: perl(Lexical::SealRequireHints) >= 0.012 BuildRequires: perl(XSLoader) # Tests BuildRequires: perl(Test::More) -%if %{with perl_Lexical_Var_enables_optional_test} # Optional Tests +BuildRequires: perl(Thread::Semaphore) +BuildRequires: perl(threads) +BuildRequires: perl(threads::shared) +%if %{with perl_Lexical_Var_enables_optional_test} BuildRequires: perl(Test::Pod) >= 1.00 BuildRequires: perl(Test::Pod::Coverage) %endif @@ -43,7 +44,6 @@ infrastructure for modules that manage name spaces. %prep %setup -q -n Lexical-Var-%{version} -%patch0 -p1 %build perl Build.PL --installdirs=vendor --optimize="$RPM_OPT_FLAGS" @@ -64,6 +64,9 @@ find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -delete %{_mandir}/man3/* %changelog +* Fri Mar 24 2023 Jitka Plesnikova - 0.010-1 +- 0.010 bump + * Fri Jan 20 2023 Fedora Release Engineering - 0.009-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index f24684c..4ba1f24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Lexical-Var-0.009.tar.gz) = c422f2bd4d996a6c6dcf9b57663fe4c16d508e2ecb174b30fd7330ad893e6a6776c92c0bbb28e48d0050f37ba761857cbbd10bf2fa70ad6db17a060cc782492f +SHA512 (Lexical-Var-0.010.tar.gz) = 8c126961ec34c8419a8c832afc04e3f47f72c64d84df8d72a73477d9b7648e5ae7aac203da81a51e35f966c63e9688a1c25bf0f171416028c33d0717742be100