From 50e33ccee5c0682dbaad2a5f4e4b3af3fff76913 Mon Sep 17 00:00:00 2001 From: Paul Howarth <p...@city-fan.org> Date: Sep 14 2017 08:05:10 +0000 Subject: Update to 1.60
- New upstream release 1.60 - Fixed t/clean.t to be insensitive to tidyp library version (GH#26) - Classify buildreqs by usage --- diff --git a/.gitignore b/.gitignore index 705b8f3..2be8c23 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /HTML-Tidy-1.54.tar.gz /HTML-Tidy-1.56.tar.gz /HTML-Tidy-1.58.tar.gz +/HTML-Tidy-1.60.tar.gz diff --git a/HTML-Tidy-1.58-tidyp-version.patch b/HTML-Tidy-1.58-tidyp-version.patch deleted file mode 100644 index 9f4cdce..0000000 --- a/HTML-Tidy-1.58-tidyp-version.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- t/clean.t -+++ t/clean.t -@@ -17,6 +17,9 @@ throws_ok { - } qr/\Q$expected_pattern\E/, - 'clean() croaks when not given a string or list of strings'; - -+TODO: -+{ -+local $TODO = "https://github.com/petdance/html-tidy/issues/26"; - is( - $tidy->clean(''), - _expected_empty_html(), -@@ -28,7 +31,7 @@ sub _expected_empty_html { - <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> - <html> - <head> --<meta name="generator" content="tidyp for Linux (v1.02), see www.w3.org"> -+<meta name="generator" content="tidyp for Linux (v1.04), see www.w3.org"> - <title></title> - </head> - <body> -@@ -36,3 +39,4 @@ sub _expected_empty_html { - </html> - ENDHTML - } -+} diff --git a/perl-HTML-Tidy.spec b/perl-HTML-Tidy.spec index 3b4eb83..d9b7c7d 100644 --- a/perl-HTML-Tidy.spec +++ b/perl-HTML-Tidy.spec @@ -1,16 +1,11 @@ Name: perl-HTML-Tidy -Version: 1.58 -Release: 4%{?dist} +Version: 1.60 +Release: 1%{?dist} Summary: (X)HTML cleanup in a Perl object License: Artistic 2.0 and (GPL+ or Artistic) -Group: Development/Libraries URL: http://search.cpan.org/dist/HTML-Tidy/ Source0: http://www.cpan.org/authors/id/P/PE/PETDANCE/HTML-Tidy-%{version}.tar.gz -Patch0: HTML-Tidy-1.58-tidyp-version.patch -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) -# needed by webtidy to fetch URLs -Requires: perl(LWP::Simple) -# non-perl +# Build BuildRequires: coreutils BuildRequires: findutils BuildRequires: gcc @@ -18,20 +13,36 @@ BuildRequires: libtidyp-devel BuildRequires: make BuildRequires: perl-devel BuildRequires: perl-generators +BuildRequires: perl-interpreter +BuildRequires: perl(Config) +BuildRequires: perl(ExtUtils::Liblist) +BuildRequires: perl(ExtUtils::MakeMaker) +# Runtime BuildRequires: perl(base) -BuildRequires: perl(constant) BuildRequires: perl(Carp) +BuildRequires: perl(constant) BuildRequires: perl(Exporter) -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(overload) +BuildRequires: perl(strict) +BuildRequires: perl(warnings) +BuildRequires: perl(XSLoader) +# Script Runtime +BuildRequires: perl(Getopt::Long) BuildRequires: perl(LWP::Simple) +# Test Suite +BuildRequires: perl(Encode) BuildRequires: perl(Test::Builder) BuildRequires: perl(Test::Exception) -BuildRequires: perl(Test::More) -BuildRequires: perl(XSLoader) -# optional tests -BuildRequires: perl(Test::Pod) -BuildRequires: perl(Test::Pod::Coverage) +BuildRequires: perl(Test::More) >= 0.98 +# Optional Tests +BuildRequires: perl(Test::Pod) >= 1.14 +BuildRequires: perl(Test::Pod::Coverage) >= 1.04 +# Dependencies +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +# needed by webtidy to fetch URLs +Requires: perl(LWP::Simple) +# Don't "provide" private Perl libs %{?perl_default_filter} %description @@ -42,9 +53,6 @@ looking to migrate, see the section "Converting from HTML::Lint". %prep %setup -q -n HTML-Tidy-%{version} -# https://github.com/petdance/html-tidy/issues/26 -%patch0 - find . -type f -exec chmod -c -x {} + find . -type f -exec perl -pi -e 's/\r//' {} + find t/ -type f -exec perl -pi -e 's|^#!perl|#!/usr/bin/perl|' {} + @@ -63,7 +71,7 @@ find %{buildroot} -type f -name '*.bs' -empty -delete make test %files -%doc Changes README* t/ +%doc Changes README.markdown t/ %{perl_vendorarch}/auto/HTML/ %{perl_vendorarch}/HTML/ %{_bindir}/webtidy @@ -71,6 +79,11 @@ make test %{_mandir}/man3/HTML::Tidy::Message.3* %changelog +* Thu Sep 14 2017 Paul Howarth <p...@city-fan.org> - 1.60-1 +- Update to 1.60 + - Fixed t/clean.t to be insensitive to tidyp library version (GH#26) +- Classify buildreqs by usage + * Thu Aug 03 2017 Fedora Release Engineering <rel...@fedoraproject.org> - 1.58-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index afae942..fbc9fdf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (HTML-Tidy-1.58.tar.gz) = ca9111e6b8efa741a72b6ae02b90b2d2695e737aaadf89abfb7d67ec67ae071abd680f96b821fc088e00241d8a5c33a9f9b4522f34e93fff535890d32906153e +SHA512 (HTML-Tidy-1.60.tar.gz) = 0ddad3d7a13054148ad32b9337c8f17d6112140747b8d3a6e632cdc5d90fbebe0ce9d94ea7ba1eacd353d7e6c60d93875e950ed9c2ed52b16677dd33eed7288f https://src.fedoraproject.org/rpms/perl-HTML-Tidy/c/50e33ccee5c0682dbaad2a5f4e4b3af3fff76913?branch=master _______________________________________________ perl-devel mailing list -- perl-devel@lists.fedoraproject.org To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org