From 682149ba40b3ecaa4b20f91e6ffa7162c7cf8026 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emman...@seyman.fr>
Date: Sun, 8 Jan 2017 10:49:22 +0100
Subject: Update to 0.22
---
.gitignore | 1 +
0001-Remove-utf8-option.patch | 91 -------------------------------------------
perl-Text-ASCIITable.spec | 10 +++--
sources | 2 +-
4 files changed, 8 insertions(+), 96 deletions(-)
delete mode 100644 0001-Remove-utf8-option.patch
diff --git a/.gitignore b/.gitignore
index 8170de2..8006f82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
Text-ASCIITable-0.18.tar.gz
/Text-ASCIITable-0.20.tar.gz
+/Text-ASCIITable-0.22.tar.gz
diff --git a/0001-Remove-utf8-option.patch b/0001-Remove-utf8-option.patch
deleted file mode 100644
index a6329c7..0000000
--- a/0001-Remove-utf8-option.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From dcd0d8011eeaf7f74a8f03e3600235303e64f7d7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
-Date: Thu, 22 Dec 2016 13:12:48 +0100
-Subject: [PATCH] Remove utf8 option
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This feature caused test failures since Encode-2.87 because it tried to
-reinterpret input strings as UTF-8 octet stream.
-
-It's application's responsibility to provide input as Unicode strings.
-This how Perl works.
-
-CPAN RT#118483
-
-Signed-off-by: Petr Písař <ppi...@redhat.com>
----
- lib/Text/ASCIITable.pm | 2 --
- t/03_options.t | 3 ++-
- t/13_utf8.t | 5 +++--
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/lib/Text/ASCIITable.pm b/lib/Text/ASCIITable.pm
-index b630910..c4449e0 100644
---- a/lib/Text/ASCIITable.pm
-+++ b/lib/Text/ASCIITable.pm
-@@ -88,7 +88,6 @@ sub new {
- $self->{options}{alignHeadRow} = $self->{options}{alignHeadRow} || 'auto';
# default setting
- $self->{options}{undef_as} = $self->{options}{undef_as} || ''; # default
setting
- $self->{options}{chaining} = $self->{options}{chaining} || 0; # default
setting
-- $self->{options}{utf8} = defined($self->{options}{utf8}) ?
$self->{options}{utf8} : 1; # default setting
-
- bless $self;
-
-@@ -884,7 +883,6 @@ sub count {
- $str =~ s/<.+?>//g if $self->{options}{allowHTML};
- $str =~ s/\33\[(\d+(;\d+)?)?[musfwhojBCDHRJK]//g if
$self->{options}{allowANSI}; # maybe i should only have allowed ESC[#;#m and
not things not related to
- $str =~ s/\33\([0B]//g if $self->{options}{allowANSI};
# color/bold/underline.. But I want to give people as much room as they
need.
-- $str = decode("utf8", $str) if $self->{options}{utf8};
-
- return length($str);
- }
-diff --git a/t/03_options.t b/t/03_options.t
-index d8ef530..162c286 100644
---- a/t/03_options.t
-+++ b/t/03_options.t
-@@ -2,6 +2,7 @@
-
- BEGIN { $| = 1; print "1..6\n"; }
- END {print "not ok 1\n" unless $loaded;}
-+use utf8;
- use Text::ASCIITable;
- $loaded = 1;
- print "ok 1\n";
-@@ -9,7 +10,7 @@ $i=2;
-
- $t = new Text::ASCIITable({ hide_LastLine => 1, hide_HeadLine => 1 });
- ok($t->setCols(['id','nick','name']));
--ok($t->addRow('1','Lunatic-|','H�kon Nessj�en'));
-+ok($t->addRow('1','Lunatic-|','Håkon Nessjøen'));
- $t->addRow('2','tesepe','William Viker');
- $t->addRow('3','espen','Espen Ursin-Holm');
- $t->addRow('4','bonde','Martin Mikkelsen');
-diff --git a/t/13_utf8.t b/t/13_utf8.t
-index d0ef858..59649f2 100644
---- a/t/13_utf8.t
-+++ b/t/13_utf8.t
-@@ -2,6 +2,7 @@
-
- BEGIN { $| = 1; print "1..6\n"; }
- END {print "not ok 1\n" unless $loaded;}
-+use utf8;
- use Text::ASCIITable;
- $loaded = 1;
- print "ok 1\n";
-@@ -18,9 +19,9 @@ eval {
- };
- if (!$@) {ok(undef)} else {ok(1)}
- @arr = split(/\n/,$content);
--ok(length($arr[3]) < length($arr[4])?undef:1);
-+ok(length($arr[3]) == length($arr[4])?undef:1);
- ok(length($arr[3]) == $t->getTableWidth()?undef:1);
--ok(length($arr[6]) > $t->getTableWidth()?undef:1);
-+ok(length($arr[6]) == $t->getTableWidth()?undef:1);
- if (scalar(@arr) == 8) {ok(undef);} else {ok(1);}
-
- sub ok{print(defined(shift)?"not ok $i\n":"ok $i\n");$i++;}
---
-2.7.4
-
diff --git a/perl-Text-ASCIITable.spec b/perl-Text-ASCIITable.spec
index 0bf3b9c..5349c72 100644
--- a/perl-Text-ASCIITable.spec
+++ b/perl-Text-ASCIITable.spec
@@ -1,12 +1,11 @@
Name: perl-Text-ASCIITable
-Version: 0.20
-Release: 14%{?dist}
+Version: 0.22
+Release: 1%{?dist}
Summary: Create a nice formatted table using ASCII characters
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Text-ASCIITable/
Source0:
http://www.cpan.org/authors/id/L/LU/LUNATIC/Text-ASCIITable-%{version}.tar.gz
-Patch0: 0001-Remove-utf8-option.patch
BuildArch: noarch
BuildRequires: perl-generators
BuildRequires: perl(Carp)
@@ -23,7 +22,6 @@ human-readable, or "cool" way.
%prep
%setup -q -n Text-ASCIITable-%{version}
-%patch0 -p1
for i in ansi-example.pl META.yml README t/*; do
iconv -f iso8859-1 -t utf-8 $i > $i.conv && mv -f $i.conv $i
done
@@ -50,6 +48,10 @@ done
%{_mandir}/man3/*
%changelog
+* Sun Jan 08 2017 Emmanuel Seyman <emman...@seyman.fr> - 0.22-1
+- Update to 0.22
+- Drop upstreamed patch
+
* Sun Dec 25 2016 Emmanuel Seyman <emman...@seyman.fr> - 0.20-14
- Apply patch by Petr Pisar to prevent utf8 failures (#1382015)
diff --git a/sources b/sources
index a2be7d6..065ff66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13dce0bcfa2484501199222bab251f87 Text-ASCIITable-0.20.tar.gz
+SHA512 (Text-ASCIITable-0.22.tar.gz) =
cdf550b84c1dbe2b39aa59945a53964237444e55ad64af26d736c4a3525bb037dbf4fb38f380cd9d6477cb8f98017a1e57668ca63139137d58d0ed45287e4bf9
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/perl-Text-ASCIITable.git/commit/?h=master&id=682149ba40b3ecaa4b20f91e6ffa7162c7cf8026
_______________________________________________
perl-devel mailing list -- perl-devel@lists.fedoraproject.org
To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org
