From ead4489b3f8f65e7936e79b592d27548198d675d Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Mon, 19 Nov 2018 16:20:01 +0000
Subject: [PATCH] Update to 20181120 (see CHANGES.md for details)

---
 Perl-Tidy-utf8.patch | 19 -------------------
 perltidy.spec        | 26 +++++++++++++++-----------
 sources              |  2 +-
 3 files changed, 16 insertions(+), 31 deletions(-)
 delete mode 100644 Perl-Tidy-utf8.patch

diff --git a/Perl-Tidy-utf8.patch b/Perl-Tidy-utf8.patch
deleted file mode 100644
index da031db..0000000
--- a/Perl-Tidy-utf8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- CHANGES
-+++ CHANGES
-@@ -1548,14 +1548,14 @@ Perltidy Change Log
-       closing side comments (-csc) could have incorrect text.  This is
-       annoying but will be correct the next time perltidy is run with -csc.
- 
--     -Implemented XHTML patch submitted by Ville Skyttä.
-+     -Implemented XHTML patch submitted by Ville Skyttä.
- 
-      -Fixed bug where whitespace was being removed between 'Bar' and '()' 
-       in a use statement like:
- 
-            use Foo::Bar ();
- 
--      Thanks to Ville Skyttä for reporting this.
-+      Thanks to Ville Skyttä for reporting this.
- 
-      -Whenever possible, if a logical expression is broken with leading
-       '&&', '||', 'and', or 'or', then the leading line will be padded
diff --git a/perltidy.spec b/perltidy.spec
index bf4cc6c..7b05951 100644
--- a/perltidy.spec
+++ b/perltidy.spec
@@ -1,11 +1,10 @@
 Name:		perltidy
-Version:	20180220
-Release:	3%{?dist}
+Version:	20181120
+Release:	1%{?dist}
 Summary:	Tool for indenting and re-formatting Perl scripts
 License:	GPLv2+
 URL:		http://perltidy.sourceforge.net/
 Source0:	https://cpan.metacpan.org/modules/by-module/Perl/Perl-Tidy-%{version}.tar.gz
-Patch0:		Perl-Tidy-utf8.patch
 BuildArch:	noarch
 # Module Build
 BuildRequires:	coreutils
@@ -20,6 +19,7 @@ BuildRequires:	perl(Carp)
 BuildRequires:	perl(constant)
 BuildRequires:	perl(Cwd)
 BuildRequires:	perl(Data::Dumper)
+BuildRequires:	perl(Digest::MD5)
 BuildRequires:	perl(Encode)
 BuildRequires:	perl(Exporter)
 BuildRequires:	perl(File::Basename)
@@ -27,7 +27,9 @@ BuildRequires:	perl(File::Copy)
 BuildRequires:	perl(File::Spec)
 BuildRequires:	perl(File::Temp)
 BuildRequires:	perl(Getopt::Long)
+BuildRequires:	perl(HTML::Entities)
 BuildRequires:	perl(IO::File)
+BuildRequires:	perl(Pod::Html)
 BuildRequires:	perl(strict)
 BuildRequires:	perl(vars)
 BuildRequires:	perl(warnings)
@@ -38,6 +40,8 @@ BuildRequires:	perl(utf8)
 # Runtime
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:	perl(File::Spec)
+Requires:	perl(HTML::Entities)
+Requires:	perl(Pod::Html)
 Provides:	perl-Perl-Tidy = %{version}-%{release}
 
 %description
@@ -54,17 +58,11 @@ because it is very good at localizing errors.
 %prep
 %setup -q -n Perl-Tidy-%{version}
 
-# Re-format documentation as UTF-8
-%patch0
-
 # Don't need Windows batch file
 rm examples/pt.bat
 
-# We'll ship the perltidy manpage in %%{_mandir} so we don't need another copy
-rm docs/perltidy.1
-
 # Quieten complaints about missing files
-sed -i -e '/^examples\/pt\.bat/d; /^docs\/perltidy\.1/d' MANIFEST
+sed -i -e '/^examples\/pt\.bat/d' MANIFEST
 
 # Remove unwanted exec permissions
 find examples/ lib/ -type f -perm /a+x -exec chmod -c -x {} \;
@@ -87,13 +85,19 @@ make test
 %else
 %doc COPYING
 %endif
-%doc BUGS CHANGES README TODO docs/ examples/
+%doc BUGS.md CHANGES.md README.md docs/ examples/
 %{_bindir}/perltidy
 %{perl_vendorlib}/Perl/
 %{_mandir}/man1/perltidy.1*
 %{_mandir}/man3/Perl::Tidy.3*
+%{_mandir}/man3/Perl::Tidy::Formatter.3*
 
 %changelog
+* Mon Nov 19 2018 Paul Howarth <paul@city-fan.org> - 20181120-1
+- Update to 20181120 (see CHANGES.md for details)
+- Drop UTF-8 patch, no longer needed
+- Text documentation converted to markdown upstream
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20180220-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index a18d5e1..ea3ff1a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Perl-Tidy-20180220.tar.gz) = 93bdf2c18efdd9d62d5bb666ded9d9502a722370049a2a51f9d41107d7fa67acd91dfdd184a11eaab287f11a901ad686585e959f09407b0493719d19ce5d842e
+SHA512 (Perl-Tidy-20181120.tar.gz) = 5b75178f9fd874fa173a562d765091c66a8fc56b1efc16ace9cf0f6215688d7a334b7d68255aad20aa9da87bf79f9cc72604a52c56398952157512f01e53b5ca