From 49cabd368519a52e240f81f1678bbe7e3acc3dc1 Mon Sep 17 00:00:00 2001 From: Paul Howarth <[email protected]> Date: Sun, 28 May 2017 17:12:18 +0100 Subject: Update to 1.58
- New upstream release 1.58 (test fixes and more tests) - Work around overly restrictive platform+tidpy version requirement in t/clean.t (https://github.com/petdance/html-tidy/issues/26) - Drop redundant Group: tag - Simplify find commands using -empty and -delete --- .gitignore | 1 + HTML-Tidy-1.58-tidyp-version.patch | 26 ++++++++++++++++++++++++ perl-HTML-Tidy.spec | 41 +++++++++++++++++++++++++++----------- sources | 2 +- 4 files changed, 57 insertions(+), 13 deletions(-) create mode 100644 HTML-Tidy-1.58-tidyp-version.patch diff --git a/.gitignore b/.gitignore index 6d66492..705b8f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /HTML-Tidy-1.54.tar.gz /HTML-Tidy-1.56.tar.gz +/HTML-Tidy-1.58.tar.gz diff --git a/HTML-Tidy-1.58-tidyp-version.patch b/HTML-Tidy-1.58-tidyp-version.patch new file mode 100644 index 0000000..9f4cdce --- /dev/null +++ b/HTML-Tidy-1.58-tidyp-version.patch @@ -0,0 +1,26 @@ +--- 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 5ebe8f2..1802b98 100644 --- a/perl-HTML-Tidy.spec +++ b/perl-HTML-Tidy.spec @@ -1,39 +1,50 @@ Name: perl-HTML-Tidy -Version: 1.56 -Release: 9%{?dist} +Version: 1.58 +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 +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: gcc BuildRequires: libtidyp-devel +BuildRequires: make BuildRequires: perl-devel BuildRequires: perl-generators BuildRequires: perl(base) BuildRequires: perl(constant) BuildRequires: perl(Carp) BuildRequires: perl(Exporter) -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(Test::Builder) +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(LWP::Simple) +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) BuildRequires: perl(Test::Pod::Coverage) %{?perl_default_filter} %description HTML::Tidy is an HTML checker in a handy dandy object. It's meant as a -replacement for HTML::Lint. If you're currently an HTML::Lint user +replacement for HTML::Lint. If you're currently an HTML::Lint user 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|' {} + @@ -44,10 +55,9 @@ make %{?_smp_mflags} %install make pure_install DESTDIR=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} + -find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} + -find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; -%{_fixperms} %{buildroot}/* +find %{buildroot} -type f -name .packlist -delete +find %{buildroot} -type f -name '*.bs' -empty -delete +%{_fixperms} -c %{buildroot} %check make test @@ -57,10 +67,17 @@ make test %{perl_vendorarch}/auto/HTML/ %{perl_vendorarch}/HTML/ %{_bindir}/webtidy -%{_mandir}/man3/HTML::Tidy.3pm* -%{_mandir}/man3/HTML::Tidy::Message.3pm* +%{_mandir}/man3/HTML::Tidy.3* +%{_mandir}/man3/HTML::Tidy::Message.3* %changelog +* Sun May 28 2017 Paul Howarth <[email protected]> - 1.58-1 +- Update to 1.58 (test fixes and more tests) +- Work around overly restrictive platform+tidpy version requirement in t/clean.t + (https://github.com/petdance/html-tidy/issues/26) +- Drop redundant Group: tag +- Simplify find commands using -empty and -delete + * Sat Feb 11 2017 Fedora Release Engineering <[email protected]> - 1.56-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 8db6d79..afae942 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dd4c0909e93033512606abf2f4e65dae HTML-Tidy-1.56.tar.gz +SHA512 (HTML-Tidy-1.58.tar.gz) = ca9111e6b8efa741a72b6ae02b90b2d2695e737aaadf89abfb7d67ec67ae071abd680f96b821fc088e00241d8a5c33a9f9b4522f34e93fff535890d32906153e -- cgit v1.1 https://src.fedoraproject.org/cgit/perl-HTML-Tidy.git/commit/?h=master&id=49cabd368519a52e240f81f1678bbe7e3acc3dc1 _______________________________________________ perl-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
