Compare commits
1 Commits
c8-stream-
...
c10
| Author | SHA1 | Date | |
|---|---|---|---|
| 7e105a8176 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/Locale-Maketext-1.28.tar.gz
|
||||
Locale-Maketext-1.32.tar.gz
|
||||
|
||||
@ -1 +0,0 @@
|
||||
fa87e5a7fde014304fd079ea454011c9ed6974d7 SOURCES/Locale-Maketext-1.28.tar.gz
|
||||
98
Locale-Maketext-1.32-Upgrade-to-1.33.patch
Normal file
98
Locale-Maketext-1.32-Upgrade-to-1.33.patch
Normal file
@ -0,0 +1,98 @@
|
||||
From acce3c021f8f3e6fac1e39590169ffabc7d2b2b5 Mon Sep 17 00:00:00 2001
|
||||
From: Jitka Plesnikova <jplesnik@redhat.com>
|
||||
Date: Wed, 17 May 2023 15:36:04 +0200
|
||||
Subject: [PATCH] Upgrade to 1.33
|
||||
|
||||
---
|
||||
Makefile.PL | 15 +++++++++++----
|
||||
lib/Locale/Maketext.pm | 2 +-
|
||||
t/00_load.t | 11 -----------
|
||||
t/pod.t | 8 --------
|
||||
4 files changed, 12 insertions(+), 24 deletions(-)
|
||||
delete mode 100644 t/00_load.t
|
||||
delete mode 100644 t/pod.t
|
||||
|
||||
diff --git a/Makefile.PL b/Makefile.PL
|
||||
index e4a2717..212982d 100644
|
||||
--- a/Makefile.PL
|
||||
+++ b/Makefile.PL
|
||||
@@ -1,4 +1,4 @@
|
||||
-require 5.004;
|
||||
+require 5.006; # uses 'our'
|
||||
use strict;
|
||||
use ExtUtils::MakeMaker;
|
||||
|
||||
@@ -14,7 +14,7 @@ WriteMakefile(
|
||||
},
|
||||
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
|
||||
( $ExtUtils::MakeMaker::VERSION >= 6.3002 ? ( 'LICENSE' => 'perl', ) : () ),
|
||||
- ( $] >= 5.008 && $] < 5.011 ) ? ( INSTALLDIRS => 'perl' ) : (),
|
||||
+ INSTALLDIRS => ( $] < 5.011 ? 'perl' : 'site' ),
|
||||
|
||||
# If under a version with Maketext in core, overwrite that core file.
|
||||
META_MERGE => {
|
||||
@@ -28,8 +28,15 @@ WriteMakefile(
|
||||
);
|
||||
|
||||
sub MY::postamble {
|
||||
- return <<'MAKE_FRAG';
|
||||
-.PHONY: tags critic
|
||||
+ # .PHONY is not portable
|
||||
+ my $self = shift;
|
||||
+ my $phony_line = $self->can('is_make_type')
|
||||
+ && ($self->is_make_type('gmake')
|
||||
+ || $self->is_make_type('bsdmake'))
|
||||
+ ? '.PHONY: tags critic'
|
||||
+ : '';
|
||||
+
|
||||
+ return "$phony_line\n\n" . <<'MAKE_FRAG';
|
||||
|
||||
tags:
|
||||
ctags -f tags --recurse --totals \
|
||||
diff --git a/lib/Locale/Maketext.pm b/lib/Locale/Maketext.pm
|
||||
index 972f929..8979c20 100644
|
||||
--- a/lib/Locale/Maketext.pm
|
||||
+++ b/lib/Locale/Maketext.pm
|
||||
@@ -25,7 +25,7 @@ BEGIN {
|
||||
}
|
||||
|
||||
|
||||
-our $VERSION = '1.32';
|
||||
+our $VERSION = '1.33';
|
||||
our @ISA = ();
|
||||
|
||||
our $MATCH_SUPERS = 1;
|
||||
diff --git a/t/00_load.t b/t/00_load.t
|
||||
deleted file mode 100644
|
||||
index 19abdba..0000000
|
||||
--- a/t/00_load.t
|
||||
+++ /dev/null
|
||||
@@ -1,11 +0,0 @@
|
||||
-#!perl -Tw
|
||||
-
|
||||
-use warnings;
|
||||
-use strict;
|
||||
-use Test::More tests => 3;
|
||||
-
|
||||
-use_ok( 'Locale::Maketext' );
|
||||
-use_ok( 'Locale::Maketext::Guts' );
|
||||
-use_ok( 'Locale::Maketext::GutsLoader' );
|
||||
-
|
||||
-diag( "Testing Locale::Maketext $Locale::Maketext::VERSION with Perl $], $^X" );
|
||||
diff --git a/t/pod.t b/t/pod.t
|
||||
deleted file mode 100644
|
||||
index a0f6a50..0000000
|
||||
--- a/t/pod.t
|
||||
+++ /dev/null
|
||||
@@ -1,8 +0,0 @@
|
||||
-#!perl -Tw
|
||||
-
|
||||
-use warnings;
|
||||
-use strict;
|
||||
-use Test::More;
|
||||
-eval 'use Test::Pod 1.14';
|
||||
-plan skip_all => 'Test::Pod 1.14 required for testing POD' if $@;
|
||||
-all_pod_files_ok();
|
||||
--
|
||||
2.40.1
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
%global base_version 1.32
|
||||
|
||||
# Run optional test
|
||||
%if ! (0%{?rhel})
|
||||
%bcond_without perl_Locale_Maketext_enables_optional_test
|
||||
@ -5,23 +7,23 @@
|
||||
%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.33
|
||||
Release: 512%{?dist}
|
||||
Summary: Framework for localization
|
||||
License: GPL+ or Artistic
|
||||
License: GPL-1.0-or-later OR Artistic-1.0-Perl
|
||||
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
|
||||
# Unbundled from perl 5.37.11
|
||||
Patch0: Locale-Maketext-1.32-Upgrade-to-1.33.patch
|
||||
BuildArch: noarch
|
||||
BuildRequires: coreutils
|
||||
BuildRequires: findutils
|
||||
BuildRequires: make
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: perl(ExtUtils::MakeMaker)
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: perl(Config)
|
||||
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
|
||||
BuildRequires: perl(strict)
|
||||
# Run-time:
|
||||
BuildRequires: perl(Carp)
|
||||
@ -40,7 +42,6 @@ BuildRequires: perl(utf8)
|
||||
%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)
|
||||
@ -57,20 +58,46 @@ 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.
|
||||
|
||||
%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 Locale-Maketext-%{base_version}
|
||||
%patch0 -p1
|
||||
%patch -P0 -p1
|
||||
perl -i -ne 'print $_ unless m{^t/00_load.t}' MANIFEST
|
||||
perl -i -ne 'print $_ unless m{^t/pod.t}' MANIFEST
|
||||
|
||||
# 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
|
||||
make %{?_smp_mflags}
|
||||
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
|
||||
%{make_build}
|
||||
|
||||
%install
|
||||
make pure_install DESTDIR=$RPM_BUILD_ROOT
|
||||
find $RPM_BUILD_ROOT -type f -name .packlist -delete
|
||||
%{_fixperms} $RPM_BUILD_ROOT/*
|
||||
%{make_install}
|
||||
%{_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 . -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
|
||||
@ -78,7 +105,90 @@ make test
|
||||
%{perl_vendorlib}/*
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%files tests
|
||||
%{_libexecdir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.33-512
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
* Fri Aug 09 2024 Jitka Plesnikova <jplesnik@redhat.com> - 1.33-511
|
||||
- Perl 5.40 re-rebuild of bootstrapped packages
|
||||
|
||||
* Thu Aug 08 2024 Jitka Plesnikova <jplesnik@redhat.com> - 1.33-510
|
||||
- Increase release to favour standalone package
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.33-504
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-503
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-502
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-501
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Wed Jul 12 2023 Jitka Plesnikova <jplesnik@redhat.com> - 1.33-500
|
||||
- Perl 5.38 re-rebuild of bootstrapped packages
|
||||
|
||||
* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 1.33-499
|
||||
- Increase release to favour standalone package
|
||||
|
||||
* Wed May 17 2023 Jitka Plesnikova <jplesnik@redhat.com> - 1.33-1
|
||||
- Upgrade to 1.33 as provided in perl-5.37.11
|
||||
|
||||
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.32-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Tue Aug 23 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.32-1
|
||||
- 1.32 bump
|
||||
|
||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.31-490
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Fri Jun 03 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.31-489
|
||||
- Perl 5.36 re-rebuild of bootstrapped packages
|
||||
|
||||
* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.31-488
|
||||
- Increase release to favour standalone package
|
||||
|
||||
* Tue Apr 19 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.31-1
|
||||
- 1.31 bump
|
||||
|
||||
* Mon Apr 04 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.30-1
|
||||
- 1.30 bump
|
||||
- Package tests
|
||||
|
||||
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-480
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-479
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Mon May 24 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.29-478
|
||||
- Perl 5.34 re-rebuild of bootstrapped packages
|
||||
|
||||
* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.29-477
|
||||
- Increase release to favour standalone package
|
||||
|
||||
* 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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user