From 4d68e95fe6eb9ecf4237850f85eb2cc78d5939b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 5 Dec 2014 09:02:03 +0100 Subject: [PATCH] 1.26 bump --- .gitignore | 1 + ...ca19f99c6e9e39496c486af323ba6a8-star.patch | 79 ------------------- perl-Locale-Maketext.spec | 10 +-- sources | 2 +- 4 files changed, 7 insertions(+), 85 deletions(-) delete mode 100644 Locale-Maketext-1.25-Commit-1735f6f53ca19f99c6e9e39496c486af323ba6a8-star.patch diff --git a/.gitignore b/.gitignore index 7e6347a..b282584 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /Locale-Maketext-1.23.tar.gz /Locale-Maketext-1.25.tar.gz +/Locale-Maketext-1.26.tar.gz diff --git a/Locale-Maketext-1.25-Commit-1735f6f53ca19f99c6e9e39496c486af323ba6a8-star.patch b/Locale-Maketext-1.25-Commit-1735f6f53ca19f99c6e9e39496c486af323ba6a8-star.patch deleted file mode 100644 index 9e22643..0000000 --- a/Locale-Maketext-1.25-Commit-1735f6f53ca19f99c6e9e39496c486af323ba6a8-star.patch +++ /dev/null @@ -1,79 +0,0 @@ -From b130af4d27aa7d29f2af2b61296abc1bb6ae6d66 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=3D=3FUTF-8=3Fq=3FPetr=3D20P=3DC3=3DADsa=3DC5=3D99=3F=3D?= - -Date: Fri, 8 Nov 2013 02:17:08 +0100 -Subject: [PATCH] Commit 1735f6f53ca19f99c6e9e39496c486af323ba6a8 started to - escape all back-slashes which breaks case when lexicon translations contain - substition and literals with eval-non-safe characters. E.g. these - translations: -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -"[_1]foo\\n\n" => "[_1]bar\\n\n", -'[_1]foo\n' => '[_1]aěa\n', - -got doubled back-slashes on the maketext() output. - -This patch de-escapes escaped backslashes if the literal is compiled as -function argument. - -Fixes RT #120457. - -Signed-off-by: Petr Písař - -Petr Pisar: Missing test fore-ported to 1.25. - -diff --git a/MANIFEST b/MANIFEST -index 32c65ba..b409558 100644 ---- a/MANIFEST -+++ b/MANIFEST -@@ -23,5 +23,6 @@ t/50_super.t - t/60_super.t - t/70_fail_auto.t - t/90_utf8.t -+t/91_backslash.t See if Locale::Maketext works - t/pod.t - META.json Module JSON meta-data (added by MakeMaker) -diff --git a/t/91_backslash.t b/t/91_backslash.t -new file mode 100644 -index 0000000..f96edd1 ---- /dev/null -+++ b/t/91_backslash.t -@@ -0,0 +1,33 @@ -+#!/usr/bin/perl -Tw -+ -+use strict; -+use Test::More tests => 6; -+ -+BEGIN { -+ use_ok( 'Locale::Maketext' ); -+} -+ -+use utf8; -+ -+{ -+ package My::Localize; -+ our @ISA = ('Locale::Maketext'); -+} -+{ -+ package My::Localize::cs_cz; -+ our @ISA = ('My::Localize'); -+ our %Lexicon = ( -+ '[_1]foo1\n' => '[_1]bar\n', -+ '[_1]foo2\n' => '[_1]běr\n', -+ 'foo2\n' => 'aěa\n', -+ "[_1]foo\\n\n" => "[_1]bar\\n\n", -+ ); -+ keys %Lexicon; # dodges the 'used only once' warning -+} -+ -+my $lh = My::Localize->get_handle('cs_cz'); -+isa_ok( $lh, 'My::Localize::cs_cz' ); -+is( $lh->maketext('[_1]foo1\n', 'arg'), 'argbar\n', 'Safe parameterized' ); -+is( $lh->maketext('[_1]foo2\n', 'arg'), 'argběr\n', 'Unicode parameterized' ); -+is( $lh->maketext('foo2\n'), 'aěa\n', 'Unicode literal' ); -+is( $lh->maketext("[_1]foo\\n\n", 'arg'), "argbar\\n\n", 'new line parameterized' ); --- -1.8.3.1 - diff --git a/perl-Locale-Maketext.spec b/perl-Locale-Maketext.spec index 32643d8..656ba1a 100644 --- a/perl-Locale-Maketext.spec +++ b/perl-Locale-Maketext.spec @@ -1,13 +1,11 @@ Name: perl-Locale-Maketext -Version: 1.25 -Release: 311%{?dist} +Version: 1.26 +Release: 1%{?dist} Summary: Framework for localization License: GPL+ or Artistic 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 -# Missing test for RT#120457, RT#121671 -Patch0: Locale-Maketext-1.25-Commit-1735f6f53ca19f99c6e9e39496c486af323ba6a8-star.patch BuildArch: noarch BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) @@ -46,7 +44,6 @@ producing localized applications. %prep %setup -q -n Locale-Maketext-%{version} -%patch0 -p1 %build perl Makefile.PL INSTALLDIRS=vendor @@ -66,6 +63,9 @@ make test %{_mandir}/man3/* %changelog +* Fri Dec 05 2014 Petr Pisar - 1.26-1 +- 1.26 bump + * Sun Sep 07 2014 Jitka Plesnikova - 1.25-311 - Perl 5.20 re-rebuild of bootstrapped packages diff --git a/sources b/sources index 610c159..76557fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -888df72c3bcf21b069d0184eb515ec37 Locale-Maketext-1.25.tar.gz +9353005389875104baa8b409e6532203 Locale-Maketext-1.26.tar.gz