Toshaan Bharvani
2 years ago
commit
59dfdfed7f
2 changed files with 321 additions and 0 deletions
@ -0,0 +1,114 @@ |
|||||||
|
From d432fdba21ba5c1ba3008b2a21e44920c329ab1f Mon Sep 17 00:00:00 2001 |
||||||
|
From: Jitka Plesnikova <jplesnik@redhat.com> |
||||||
|
Date: Thu, 24 May 2018 10:36:25 +0200 |
||||||
|
Subject: [PATCH] Upgrade to 1.29 |
||||||
|
|
||||||
|
--- |
||||||
|
lib/Locale/Maketext.pm | 13 ++++++------- |
||||||
|
lib/Locale/Maketext.pod | 2 +- |
||||||
|
t/60_super.t | 15 ++++++--------- |
||||||
|
t/70_fail_auto.t | 6 ++---- |
||||||
|
4 files changed, 15 insertions(+), 21 deletions(-) |
||||||
|
|
||||||
|
diff --git a/lib/Locale/Maketext.pm b/lib/Locale/Maketext.pm |
||||||
|
index 36d0c05..f70438b 100644 |
||||||
|
--- a/lib/Locale/Maketext.pm |
||||||
|
+++ b/lib/Locale/Maketext.pm |
||||||
|
@@ -1,7 +1,6 @@ |
||||||
|
package Locale::Maketext; |
||||||
|
use strict; |
||||||
|
-use vars qw( @ISA $VERSION $MATCH_SUPERS $USING_LANGUAGE_TAGS |
||||||
|
-$USE_LITERALS $MATCH_SUPERS_TIGHTLY); |
||||||
|
+our $USE_LITERALS; |
||||||
|
use Carp (); |
||||||
|
use I18N::LangTags (); |
||||||
|
use I18N::LangTags::Detect (); |
||||||
|
@@ -26,12 +25,12 @@ BEGIN { |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
|
-$VERSION = '1.28'; |
||||||
|
-@ISA = (); |
||||||
|
+our $VERSION = '1.29'; |
||||||
|
+our @ISA = (); |
||||||
|
|
||||||
|
-$MATCH_SUPERS = 1; |
||||||
|
-$MATCH_SUPERS_TIGHTLY = 1; |
||||||
|
-$USING_LANGUAGE_TAGS = 1; |
||||||
|
+our $MATCH_SUPERS = 1; |
||||||
|
+our $MATCH_SUPERS_TIGHTLY = 1; |
||||||
|
+our $USING_LANGUAGE_TAGS = 1; |
||||||
|
# Turning this off is somewhat of a security risk in that little or no |
||||||
|
# checking will be done on the legality of tokens passed to the |
||||||
|
# eval("use $module_name") in _try_use. If you turn this off, you have |
||||||
|
diff --git a/lib/Locale/Maketext.pod b/lib/Locale/Maketext.pod |
||||||
|
index 564e5af..24c8f24 100644 |
||||||
|
--- a/lib/Locale/Maketext.pod |
||||||
|
+++ b/lib/Locale/Maketext.pod |
||||||
|
@@ -1226,7 +1226,7 @@ If you get tired of constantly saying C<print $lh-E<gt>maketext>, |
||||||
|
consider making a functional wrapper for it, like so: |
||||||
|
|
||||||
|
use Projname::L10N; |
||||||
|
- use vars qw($lh); |
||||||
|
+ our $lh; |
||||||
|
$lh = Projname::L10N->get_handle(...) || die "Language?"; |
||||||
|
sub pmt (@) { print( $lh->maketext(@_)) } |
||||||
|
# "pmt" is short for "Print MakeText" |
||||||
|
diff --git a/t/60_super.t b/t/60_super.t |
||||||
|
index d54fc33..5ac0959 100644 |
||||||
|
--- a/t/60_super.t |
||||||
|
+++ b/t/60_super.t |
||||||
|
@@ -9,23 +9,20 @@ BEGIN { |
||||||
|
|
||||||
|
{ |
||||||
|
package Whunk::L10N; |
||||||
|
- use vars qw(@ISA %Lexicon); |
||||||
|
- @ISA = 'Locale::Maketext'; |
||||||
|
- %Lexicon = ('hello' => 'SROBLR!'); |
||||||
|
+ our @ISA = 'Locale::Maketext'; |
||||||
|
+ our %Lexicon = ('hello' => 'SROBLR!'); |
||||||
|
} |
||||||
|
|
||||||
|
{ |
||||||
|
package Whunk::L10N::en; |
||||||
|
- use vars qw(@ISA %Lexicon); |
||||||
|
- @ISA = 'Whunk::L10N'; |
||||||
|
- %Lexicon = ('hello' => 'HI AND STUFF!'); |
||||||
|
+ our @ISA = 'Whunk::L10N'; |
||||||
|
+ our %Lexicon = ('hello' => 'HI AND STUFF!'); |
||||||
|
} |
||||||
|
|
||||||
|
{ |
||||||
|
package Whunk::L10N::zh_tw; |
||||||
|
- use vars qw(@ISA %Lexicon); |
||||||
|
- @ISA = 'Whunk::L10N'; |
||||||
|
- %Lexicon = ('hello' => 'NIHAU JOE!'); |
||||||
|
+ our @ISA = 'Whunk::L10N'; |
||||||
|
+ our %Lexicon = ('hello' => 'NIHAU JOE!'); |
||||||
|
} |
||||||
|
|
||||||
|
$ENV{'REQUEST_METHOD'} = 'GET'; |
||||||
|
diff --git a/t/70_fail_auto.t b/t/70_fail_auto.t |
||||||
|
index 44fe54d..df0de3e 100644 |
||||||
|
--- a/t/70_fail_auto.t |
||||||
|
+++ b/t/70_fail_auto.t |
||||||
|
@@ -9,14 +9,12 @@ BEGIN { |
||||||
|
|
||||||
|
{ |
||||||
|
package Whunk::L10N; |
||||||
|
- use vars qw(@ISA); |
||||||
|
- @ISA = 'Locale::Maketext'; |
||||||
|
+ our @ISA = 'Locale::Maketext'; |
||||||
|
} |
||||||
|
|
||||||
|
{ |
||||||
|
package Whunk::L10N::en; |
||||||
|
- use vars qw(@ISA); |
||||||
|
- @ISA = 'Whunk::L10N'; |
||||||
|
+ our @ISA = 'Whunk::L10N'; |
||||||
|
} |
||||||
|
|
||||||
|
my $lh = Whunk::L10N->get_handle('en'); |
||||||
|
-- |
||||||
|
2.14.3 |
||||||
|
|
@ -0,0 +1,207 @@ |
|||||||
|
# Run optional test |
||||||
|
%if ! (0%{?rhel}) |
||||||
|
%bcond_without perl_Locale_Maketext_enables_optional_test |
||||||
|
%else |
||||||
|
%bcond_with perl_Locale_Maketext_enables_optional_test |
||||||
|
%endif |
||||||
|
|
||||||
|
%global base_version 1.28 |
||||||
|
|
||||||
|
Name: perl-Locale-Maketext |
||||||
|
Version: 1.29 |
||||||
|
Release: 461%{?dist} |
||||||
|
Summary: Framework for localization |
||||||
|
License: GPL+ or Artistic |
||||||
|
URL: https://metacpan.org/release/Locale-Maketext |
||||||
|
Source0: https://cpan.metacpan.org/authors/id/T/TO/TODDR/Locale-Maketext-%{base_version}.tar.gz |
||||||
|
# Unbundled from perl 5.28.0-RC1 |
||||||
|
Patch0: Locale-Maketext-1.28-Upgrade-to-1.29.patch |
||||||
|
BuildArch: noarch |
||||||
|
BuildRequires: findutils |
||||||
|
BuildRequires: make |
||||||
|
BuildRequires: perl-interpreter |
||||||
|
BuildRequires: perl-generators |
||||||
|
BuildRequires: perl(ExtUtils::MakeMaker) |
||||||
|
BuildRequires: perl(strict) |
||||||
|
# Run-time: |
||||||
|
BuildRequires: perl(Carp) |
||||||
|
BuildRequires: perl(I18N::LangTags) >= 0.31 |
||||||
|
BuildRequires: perl(I18N::LangTags::Detect) |
||||||
|
BuildRequires: perl(integer) |
||||||
|
# utf8 is used only if it has already been loaded |
||||||
|
BuildRequires: perl(vars) |
||||||
|
BuildRequires: perl(warnings) |
||||||
|
# Tests: |
||||||
|
BuildRequires: perl(parent) |
||||||
|
BuildRequires: perl(Scalar::Util) |
||||||
|
BuildRequires: perl(Test::More) |
||||||
|
BuildRequires: perl(utf8) |
||||||
|
# Optional tests: |
||||||
|
%if %{with perl_Locale_Maketext_enables_optional_test} && !%{defined perl_bootstrap} |
||||||
|
BuildRequires: perl(Test::Pod) >= 1.14 |
||||||
|
%endif |
||||||
|
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) |
||||||
|
Requires: perl(I18N::LangTags) >= 0.31 |
||||||
|
# utf8 is used only if it has already been loaded |
||||||
|
Requires: perl(warnings) |
||||||
|
|
||||||
|
# Filter under-specified dependencies |
||||||
|
%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(I18N::LangTags\\)$ |
||||||
|
|
||||||
|
%description |
||||||
|
It is a common feature of applications (whether run directly, or via the Web) |
||||||
|
for them to be "localized" -- i.e., for them to present an English interface |
||||||
|
to an English-speaker, a German interface to a German-speaker, and so on for |
||||||
|
all languages it's programmed with. Locale::Maketext is a framework for |
||||||
|
software localization; it provides you with the tools for organizing and |
||||||
|
accessing the bits of text and text-processing code that you need for |
||||||
|
producing localized applications. |
||||||
|
|
||||||
|
%prep |
||||||
|
%setup -q -n Locale-Maketext-%{base_version} |
||||||
|
%patch0 -p1 |
||||||
|
|
||||||
|
%build |
||||||
|
perl Makefile.PL INSTALLDIRS=vendor |
||||||
|
make %{?_smp_mflags} |
||||||
|
|
||||||
|
%install |
||||||
|
make pure_install DESTDIR=$RPM_BUILD_ROOT |
||||||
|
find $RPM_BUILD_ROOT -type f -name .packlist -delete |
||||||
|
%{_fixperms} $RPM_BUILD_ROOT/* |
||||||
|
|
||||||
|
%check |
||||||
|
make test |
||||||
|
|
||||||
|
%files |
||||||
|
%doc ChangeLog README |
||||||
|
%{perl_vendorlib}/* |
||||||
|
%{_mandir}/man3/* |
||||||
|
|
||||||
|
%changelog |
||||||
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.29-461 |
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags |
||||||
|
Related: rhbz#1991688 |
||||||
|
|
||||||
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.29-460 |
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 |
||||||
|
|
||||||
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-459 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild |
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-458 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild |
||||||
|
|
||||||
|
* Fri Jun 26 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.29-457 |
||||||
|
- Perl 5.32 re-rebuild of bootstrapped packages |
||||||
|
|
||||||
|
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.29-456 |
||||||
|
- Increase release to favour standalone package |
||||||
|
|
||||||
|
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-441 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild |
||||||
|
|
||||||
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-440 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild |
||||||
|
|
||||||
|
* Sun Jun 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.29-439 |
||||||
|
- Perl 5.30 re-rebuild of bootstrapped packages |
||||||
|
|
||||||
|
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.29-438 |
||||||
|
- Increase release to favour standalone package |
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-419 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild |
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-418 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild |
||||||
|
|
||||||
|
* Sat Jun 30 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.29-417 |
||||||
|
- Perl 5.28 re-rebuild of bootstrapped packages |
||||||
|
|
||||||
|
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.29-416 |
||||||
|
- Increase release to favour standalone package |
||||||
|
|
||||||
|
* Thu May 24 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.29-1 |
||||||
|
- Upgrade to 1.29 as provided in perl-5.28.0-RC1 |
||||||
|
|
||||||
|
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.28-396 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild |
||||||
|
|
||||||
|
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.28-395 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild |
||||||
|
|
||||||
|
* Wed Jun 07 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.28-394 |
||||||
|
- Perl 5.26 re-rebuild of bootstrapped packages |
||||||
|
|
||||||
|
* Sat Jun 03 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.28-393 |
||||||
|
- Perl 5.26 rebuild |
||||||
|
|
||||||
|
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.28-2 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild |
||||||
|
|
||||||
|
* Wed Jul 27 2016 Petr Pisar <ppisar@redhat.com> - 1.28-1 |
||||||
|
- 1.28 bump |
||||||
|
|
||||||
|
* Thu Jun 23 2016 Petr Pisar <ppisar@redhat.com> - 1.27-1 |
||||||
|
- 1.27 bump |
||||||
|
|
||||||
|
* Wed May 18 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.26-366 |
||||||
|
- Perl 5.24 re-rebuild of bootstrapped packages |
||||||
|
|
||||||
|
* Sat May 14 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.26-365 |
||||||
|
- Increase release to favour standalone package |
||||||
|
|
||||||
|
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-348 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild |
||||||
|
|
||||||
|
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.26-347 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild |
||||||
|
|
||||||
|
* Wed Jun 10 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.26-346 |
||||||
|
- Perl 5.22 re-rebuild of bootstrapped packages |
||||||
|
|
||||||
|
* Thu Jun 04 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.26-345 |
||||||
|
- Increase release to favour standalone package |
||||||
|
|
||||||
|
* Wed Jun 03 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.26-3 |
||||||
|
- Perl 5.22 rebuild |
||||||
|
|
||||||
|
* Fri Jan 09 2015 Petr Pisar <ppisar@redhat.com> - 1.26-2 |
||||||
|
- Require undetected warnings module explicitly |
||||||
|
|
||||||
|
* Fri Dec 05 2014 Petr Pisar <ppisar@redhat.com> - 1.26-1 |
||||||
|
- 1.26 bump |
||||||
|
|
||||||
|
* Sun Sep 07 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.25-311 |
||||||
|
- Perl 5.20 re-rebuild of bootstrapped packages |
||||||
|
|
||||||
|
* Wed Sep 03 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.25-310 |
||||||
|
- Increase release to favour standalone package |
||||||
|
|
||||||
|
* Tue Aug 26 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.25-3 |
||||||
|
- Perl 5.20 rebuild |
||||||
|
|
||||||
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-2 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild |
||||||
|
|
||||||
|
* Wed Apr 16 2014 Petr Pisar <ppisar@redhat.com> - 1.25-1 |
||||||
|
- 1.25 bump |
||||||
|
|
||||||
|
* Mon Nov 11 2013 Petr Pisar <ppisar@redhat.com> - 1.23-293 |
||||||
|
- Fix escaping backslashes (bug #1026763) |
||||||
|
|
||||||
|
* Wed Aug 14 2013 Jitka Plesnikova <jplesnik@redhat.com> - 1.23-292 |
||||||
|
- Perl 5.18 re-rebuild of bootstrapped packages |
||||||
|
|
||||||
|
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23-291 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild |
||||||
|
|
||||||
|
* Mon Jul 15 2013 Petr Pisar <ppisar@redhat.com> - 1.23-290 |
||||||
|
- Increase release to favour standalone package |
||||||
|
|
||||||
|
* Fri Jul 12 2013 Petr Pisar <ppisar@redhat.com> - 1.23-2 |
||||||
|
- Perl 5.18 rebuild |
||||||
|
|
||||||
|
* Fri Apr 05 2013 Petr Pisar <ppisar@redhat.com> 1.23-1 |
||||||
|
- Specfile autogenerated by cpanspec 1.78. |
Loading…
Reference in new issue