jplesnik pushed to perl-HTML-FormatText-WithLinks-AndTables (master). "0.06 bump"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Nov 10 12:38:14 UTC 2015
From 5fe6fbe001a507638a0195f2a95fc9c8cf777dcc Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik at redhat.com>
Date: Tue, 10 Nov 2015 13:15:26 +0100
Subject: 0.06 bump
---
.gitignore | 1 +
RT-74392.patch | 21 -------------------
col_0_fix.patch | 21 -------------------
perl-HTML-FormatText-WithLinks-AndTables.spec | 30 ++++++++++++++++-----------
sources | 2 +-
5 files changed, 20 insertions(+), 55 deletions(-)
delete mode 100644 RT-74392.patch
delete mode 100644 col_0_fix.patch
diff --git a/.gitignore b/.gitignore
index 6b0dd73..5d68ff0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/HTML-FormatText-WithLinks-AndTables-0.01.tar.gz
/HTML-FormatText-WithLinks-AndTables-0.02.tar.gz
+/HTML-FormatText-WithLinks-AndTables-0.06.tar.gz
diff --git a/RT-74392.patch b/RT-74392.patch
deleted file mode 100644
index e7411da..0000000
--- a/RT-74392.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur HTML-FormatText-WithLinks-AndTables/lib/HTML/FormatText/WithLinks/AndTables.pm HTML-FormatText-WithLinks-AndTab-patched/lib/HTML/FormatText/WithLinks/AndTables.pm
---- HTML-FormatText-WithLinks-AndTables/lib/HTML/FormatText/WithLinks/AndTables.pm 2012-06-08 10:10:37.000000000 +1000
-+++ HTML-FormatText-WithLinks-AndTab-patched/lib/HTML/FormatText/WithLinks/AndTables.pm 2012-07-24 16:17:19.964364582 +1000
-@@ -134,7 +134,7 @@
- for my $tr (@trs) { # *** 1st pass over rows
- $max_col_heights[$row_count] = 0;
- $col_lines[$row_count] = [];
-- my @cols = $tr->look_down(_tag=>'td'); # no support for <th>. sorry.
-+ my @cols = $tr->look_down(_tag=>qr/(td|th)/); # no support for <th>. sorry.
- for (my $i = 0; $i < scalar @cols; $i++) {
- my $td = $cols[$i]->clone;
- my $new_tree = HTML::TreeBuilder->new;
-@@ -167,7 +167,7 @@
- SECOND_PASS: {
- my $row_count = 0; # obviously, another counter...
- for my $tr (@trs) { # *** 2nd pass over rows
-- my @cols = $tr->look_down(_tag=>'td'); # no support for <th>. sorry.
-+ my @cols = $tr->look_down(_tag=>qr/(td|th)/); # no support for <th>. sorry.
-
- my $row_text; # the final string representing each row of reformatted text
-
diff --git a/col_0_fix.patch b/col_0_fix.patch
deleted file mode 100644
index 6ff0dda..0000000
--- a/col_0_fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur HTML-FormatText-WithLinks-AndTables/lib/HTML/FormatText/WithLinks/AndTables.pm HTML-FormatText-WithLinks-AndTab-patched/lib/HTML/FormatText/WithLinks/AndTables.pm
---- HTML-FormatText-WithLinks-AndTables/lib/HTML/FormatText/WithLinks/AndTables.pm 2012-06-08 10:10:37.000000000 +1000
-+++ HTML-FormatText-WithLinks-AndTab-patched/lib/HTML/FormatText/WithLinks/AndTables.pm 2012-07-24 16:25:07.631985777 +1000
-@@ -208,13 +208,15 @@
- $new_line .= "\n" if $j != $max_col_heights[$row_count] - 1; # add a newline to all but the last text row
- $col_rows[$j] = $new_line; # put the line into the stack for this row
- }
-- $row_text .= $_ for @col_rows;
-+ $row_text .= ($_ || '') for @col_rows; # BUGBUG this breaks on colspan in headers
- for (my $i = 1; $i < scalar @cols; $i++) {
- $cols[$i]->delete; # get rid of unneeded <td>'s
- }
- # put the fully formatted text into our accumulator
- $formatted_tables->[$table_count]->[$row_count] = $row_text;
-- $cols[0]->content->[0] = "__TOKEN__${table_count}__${row_count}__"; # place a token into the row at col 0
-+ if($cols[0]) { # BUGBUG this breaks on "complex" tables
-+ $cols[0]->content->[0] = "__TOKEN__${table_count}__${row_count}__"; # place a token into the row at col 0
-+ }
- $row_count++;
- }
- }
diff --git a/perl-HTML-FormatText-WithLinks-AndTables.spec b/perl-HTML-FormatText-WithLinks-AndTables.spec
index 453899c..ba0f78a 100644
--- a/perl-HTML-FormatText-WithLinks-AndTables.spec
+++ b/perl-HTML-FormatText-WithLinks-AndTables.spec
@@ -1,21 +1,25 @@
Name: perl-HTML-FormatText-WithLinks-AndTables
-Version: 0.02
-Release: 9%{?dist}
+Version: 0.06
+Release: 1%{?dist}
Summary: Converts HTML to Text with tables in tact
-License: GPL+ or Artistic
+License: Artistic 2.0
Group: Development/Libraries
URL: http://search.cpan.org/dist/HTML-FormatText-WithLinks-AndTables/
BuildArch: noarch
-Source0: http://www.cpan.org/authors/id/S/SF/SFRYER/HTML-FormatText-WithLinks-AndTables-%{version}.tar.gz
-Patch0: RT-74392.patch
-Patch1: col_0_fix.patch
+Source0: http://www.cpan.org/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-%{version}.tar.gz
+BuildRequires: coreutils
+BuildRequires: findutils
+BuildRequires: make
+BuildRequires: perl
+BuildRequires: perl(base)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(HTML::FormatText::WithLinks)
BuildRequires: perl(HTML::TreeBuilder)
+BuildRequires: perl(strict)
BuildRequires: perl(Test::More)
-Requires: perl(Test::More)
+BuildRequires: perl(warnings)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description
@@ -31,16 +35,14 @@ preserve multi-line text inside of a <TD> element provided it is broken
using <BR/> tags.
%prep
-%setup -q -n HTML-FormatText-WithLinks-AndTables
-%patch0 -p 1
-%patch1 -p 1
+%setup -q -n HTML-FormatText-WithLinks-AndTables-%{version}
%build
perl Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
%install
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+make pure_install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
@@ -51,11 +53,15 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
make test
%files
-%doc Changes README
+%license LICENSE
+%doc Changes README.pod
%{perl_vendorlib}/*
%{_mandir}/man3/*
%changelog
+* Tue Nov 10 2015 Jitka Plesnikova <jplesnik at redhat.com> - 0.06-1
+- 0.06 bump
+
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/sources b/sources
index dc69fa9..18a9f96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-804146aa9e49a5b1af4f63fecd9b0c28 HTML-FormatText-WithLinks-AndTables-0.02.tar.gz
+bd214ca080379cc09f0b2eef62bf3d0f HTML-FormatText-WithLinks-AndTables-0.06.tar.gz
--
cgit v0.11.2
http://pkgs.fedoraproject.org/cgit/perl-HTML-FormatText-WithLinks-AndTables.git/commit/?h=master&id=5fe6fbe001a507638a0195f2a95fc9c8cf777dcc
More information about the perl-devel
mailing list