[perl-Pod-Simple-Wiki] Update to 0.14, various cleanups

[Emmanuel Seyman]

commit 86bfb4d46305815423b71ecaf6de618ac2ee0552
Author: Emmanuel Seyman <emmanuel.seyman at club-internet.fr>
Date:   Sun Oct 14 15:37:11 2012 +0200

    Update to 0.14, various cleanups

 .gitignore                             |    1 +
 perl-Pod-Simple-Wiki-0.09-escape.patch |   38 ++++++++++++++++----------------
 perl-Pod-Simple-Wiki.spec              |   31 +++++++++++---------------
 sources                                |    2 +-
 4 files changed, 34 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f8e3c07..f8ce274 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Pod-Simple-Wiki-0.09.tar.gz
+/Pod-Simple-Wiki-0.14.tar.gz
diff --git a/perl-Pod-Simple-Wiki-0.09-escape.patch b/perl-Pod-Simple-Wiki-0.09-escape.patch
index 5da50fc..f22469e 100644
--- a/perl-Pod-Simple-Wiki-0.09-escape.patch
+++ b/perl-Pod-Simple-Wiki-0.09-escape.patch
@@ -3,23 +3,23 @@ http://rt.cpan.org/Public/Bug/Display.html?id=38833
 
 Lubomir Rintel <lkundrak at v3.sk>
 
---- Pod-Simple-Wiki-0.09/lib/Pod/Simple/Wiki/Confluence.pm.escape	2008-05-24 07:56:48.000000000 +0200
-+++ Pod-Simple-Wiki-0.09/lib/Pod/Simple/Wiki/Confluence.pm	2008-08-29 10:09:44.000000000 +0200
+--- Pod-Simple-Wiki-0.14/lib/Pod/Simple/Wiki/Confluence.pm.escape	2008-05-24 07:56:48.000000000 +0200
++++ Pod-Simple-Wiki-0.14/lib/Pod/Simple/Wiki/Confluence.pm	2008-08-29 10:09:44.000000000 +0200
 @@ -96,16 +96,11 @@
-     my $self = shift;
-     my $text = $_[0];
- 
--    # Only escape words in paragraphs
--    if (not $self->{_in_Para}) {
--        $self->{_wiki_text} .= $text;
--        return;
--    }
--
-     # Split the text into tokens but maintain the whitespace
-     my @tokens = split /(\s+)/, $text;
- 
-     # Escape any tokens here, if necessary.
-+    @tokens = map { s/([\[\{-])/\\$1/g; $_ } @tokens;
- 
-     # Rejoin the tokens and whitespace.
-     $self->{_wiki_text} .= join '', @tokens;
+     my $self = shift;
+     my $text = $_[0];
+ 
+-    # Only escape words in paragraphs
+-    if (not $self->{_in_Para}) {
+-        $self->{_wiki_text} .= $text;
+-        return;
+-    }
+-
+     # Split the text into tokens but maintain the whitespace
+     my @tokens = split /(\s+)/, $text;
+ 
+     # Escape any tokens here, if necessary.
++    @tokens = map { s/([\[\{-])/\\$1/g; $_ } @tokens;
+ 
+     # Rejoin the tokens and whitespace.
+     $self->{_wiki_text} .= join '', @tokens;
diff --git a/perl-Pod-Simple-Wiki.spec b/perl-Pod-Simple-Wiki.spec
index 2fbb942..cc5e955 100644
--- a/perl-Pod-Simple-Wiki.spec
+++ b/perl-Pod-Simple-Wiki.spec
@@ -1,6 +1,6 @@
 Name:           perl-Pod-Simple-Wiki
-Version:        0.09
-Release:        15%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Utility and perl classes for converting POD to Wiki text
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -8,13 +8,14 @@ URL:            http://search.cpan.org/dist/Pod-Simple-Wiki/
 Source0:        http://www.cpan.org/authors/id/J/JM/JMCNAMARA/Pod-Simple-Wiki-%{version}.tar.gz
 Patch0:         perl-Pod-Simple-Wiki-0.09-escape.patch
 # Reported upstream: http://rt.cpan.org/Public/Bug/Display.html?id=38833
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Pod::Simple)
 BuildRequires:  perl(Test::More)
 Requires:       perl(Pod::Simple)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
 
 %description
 The Pod::Simple::Wiki module is used for converting Pod text to Wiki text.
@@ -26,14 +27,8 @@ Mediawiki, Moinmoin, Template, Tiddlywiki, Twiki and Usemod.
 %setup -q -n Pod-Simple-Wiki-%{version}
 %patch0 -p1
 
-# Convert Windows text file encoding
-for FILE in $(find . -type f)
-do
-        sed 's/\r//g' $FILE |iconv -f cp1250 -t utf8 >$FILE.converted
-        touch --reference $FILE $FILE.converted
-        mv $FILE.converted $FILE
-done
-
+iconv -f latin1 -t utf-8 README > README.utf-8
+mv README.utf-8 README
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -41,8 +36,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
@@ -55,12 +48,7 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 make test
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
@@ -69,6 +57,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 14 2012 Emmanuel Seyman <emmanuel at seyman.fr> - 0.14-1
+- Update to 0.14
+- Clean up spec file
+- Add perl default filter
+- Convert README file to UTF-8
+- Remove the Windows text file conversion (no longer needed)
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index b233c11..2a15e6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9029379c5106b4d96a53ea1d83b68485  Pod-Simple-Wiki-0.09.tar.gz
+e7bb839313a7f13d2e654bd70caac857  Pod-Simple-Wiki-0.14.tar.gz