Compare commits

...

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

5 changed files with 8 additions and 153 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/Locale-Maketext-1.28.tar.gz
/Locale-Maketext-1.28.tar.gz

View File

@ -1 +0,0 @@
fa87e5a7fde014304fd079ea454011c9ed6974d7 SOURCES/Locale-Maketext-1.28.tar.gz

View File

@ -1,114 +0,0 @@
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

View File

@ -1,21 +1,14 @@
# 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: 440%{?dist}
Version: 1.28
Release: 396%{?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
Group: Development/Libraries
URL: http://search.cpan.org/dist/Locale-Maketext/
Source0: http://www.cpan.org/authors/id/T/TO/TODDR/Locale-Maketext-%{version}.tar.gz
BuildArch: noarch
BuildRequires: findutils
BuildRequires: make
@ -58,8 +51,7 @@ 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
%setup -q -n Locale-Maketext-%{version}
%build
perl Makefile.PL INSTALLDIRS=vendor
@ -79,30 +71,6 @@ make test
%{_mandir}/man3/*
%changelog
* 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

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (Locale-Maketext-1.28.tar.gz) = 1f4f3f3c3d4ede54007344031d7bf6094886d216f084e3ad0a58f7785cd6185ccc992ca5f399bd9afa63546b1dabcd2976e98a7e760bae9d9cbe8e3a8ec95d10