commit 919e6acf411eafa560cfdc7a766e6502df8e7860
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Thu Nov 27 17:34:14 2014 +0000
Add patch to fix POD errors (CPAN RT#85686)
- Add patch to fix POD errors (CPAN RT#85686)
- Classify buildreqs by usage
- General clean-up
Regexp-Assemble-0.35-pod.patch | 32 +++++++++++++++++
Regexp-Assemble-0.35-utf8.patch | 40 ++++++++++++++++++++++
perl-Regexp-Assemble.spec | 71 ++++++++++++++++++++++++++------------
3 files changed, 120 insertions(+), 23 deletions(-)
---
diff --git a/Regexp-Assemble-0.35-pod.patch b/Regexp-Assemble-0.35-pod.patch
new file mode 100644
index 0000000..fe2a034
--- /dev/null
+++ b/Regexp-Assemble-0.35-pod.patch
@@ -0,0 +1,32 @@
+--- Assemble.pm
++++ Assemble.pm
+@@ -1575,24 +1575,24 @@ carefully formatted output.
+
+ =over 8
+
+-=item 0
++=item * 0
+
+ Off. Turns off all debugging output.
+
+-=item 1
++=item * 1
+
+ Add. Trace the addition of patterns.
+
+-=item 2
++=item * 2
+
+ Reduce. Trace the process of reduction and assembly.
+
+-=item 4
++=item * 4
+
+ Lex. Trace the lexing of the input patterns into its constituent
+ tokens.
+
+-=item 8
++=item * 8
+
+ Time. Print to STDOUT the time taken to load all the patterns. This is
+ nothing more than the difference between the time the object was
diff --git a/Regexp-Assemble-0.35-utf8.patch b/Regexp-Assemble-0.35-utf8.patch
new file mode 100644
index 0000000..c29e51e
--- /dev/null
+++ b/Regexp-Assemble-0.35-utf8.patch
@@ -0,0 +1,40 @@
+--- Changes
++++ Changes
+@@ -7,7 +7,7 @@ Revision history for Perl extension Rege
+ 0.34 2008-06-17 20:20:14 UTC
+ - Rewrite the usage of _re_sort() in order to deal
+ with blead change #33874. Bug smoked out by Andreas
+- K�.
++ König.
+
+ 0.33 2008-06-07 14:40:57 UTC
+ - Tweaked _fastlex() to fix bug #36399 spotted by Yves
+@@ -163,7 +163,7 @@ Revision history for Perl extension Rege
+ t/00_basic.t and t/07_warning.t was born.
+ - Added an eg/ircwatcher script that demonstrates how to set up a
+ dispatch table on a tracked regular expression. Credit to David
+- Rigaudi� for the idea.
++ Rigaudière for the idea.
+ - Made sure all routines use an explicit return when it makes
+ sense to do so. (I have a tendency to use implicit returns,
+ which is evil).
+@@ -171,7 +171,7 @@ Revision history for Perl extension Rege
+ - eg/naive updated to bring its idea of $Single_Char in line with
+ Assemble.pm.
+ - Cleaned up typos and PODos in the documentation. Fixed minor
+- typo noted by David Rigaudi�.
++ typo noted by David Rigaudière.
+ - Reworked as_string() and re() to play nicely with Devel::Cover,
+ but alas, the module no longer runs under D::C at all. Something
+ to do with the overloading of "" for re()?
+--- eg/ircwatcher
++++ eg/ircwatcher
+@@ -9,7 +9,7 @@
+ #
+ # Try changing the read of STDIN to DATA for a quick demo.
+ #
+-# Acknowledgements to David "Sniper" Rigaudi� for the
++# Acknowledgements to David "Sniper" Rigaudière for the
+ # idea.
+ #
+ # Copyright (C) David Landgren 2005
diff --git a/perl-Regexp-Assemble.spec b/perl-Regexp-Assemble.spec
index b1e0a36..baa300d 100644
--- a/perl-Regexp-Assemble.spec
+++ b/perl-Regexp-Assemble.spec
@@ -1,17 +1,38 @@
Name: perl-Regexp-Assemble
Version: 0.35
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Assemble multiple Regular Expressions into a single RE
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Regexp-Assemble/
Source0: http://www.cpan.org/authors/id/D/DL/DLAND/Regexp-Assemble-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: Regexp-Assemble-0.35-utf8.patch
+Patch1: Regexp-Assemble-0.35-pod.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildArch: noarch
+# Module Build
+BuildRequires: perl
BuildRequires: perl(ExtUtils::MakeMaker)
+# Module Runtime
+BuildRequires: perl(Carp)
+BuildRequires: perl(constant)
+BuildRequires: perl(overload)
+BuildRequires: perl(re)
+BuildRequires: perl(Storable)
+BuildRequires: perl(strict)
+BuildRequires: perl(Time::HiRes)
+BuildRequires: perl(vars)
+# Test Suite
+BuildRequires: perl(Test::More)
+# Optional Tests
BuildRequires: perl(Test::File::Contents)
+BuildRequires: perl(Test::Pod)
+BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::Warn)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Runtime
+Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+Requires: perl(Storable)
+Requires: perl(Time::HiRes)
%description
Regexp::Assemble takes an arbitrary number of regular expressions and
@@ -20,40 +41,44 @@ that the individual REs match.
%prep
%setup -q -n Regexp-Assemble-%{version}
-# tidy up the examples
-find eg -type f | xargs chmod -x
-find eg -type f | xargs perl -pi -e 's|^#!\s*/usr/local/bin/perl\S*|%{__perl}|'
-for f in Changes eg/ircwatcher; do
- iconv -f iso8859-1 -t utf-8 $f >$f.conf && mv $f.conf $f
-done
-%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
+# Re-code docs as UTF8
+%patch0
-%install
-rm -rf $RPM_BUILD_ROOT
+# Fix POD errors (CPAN RT#85686)
+%patch1
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+# Tidy up the examples (note that eg/file.3 is required to have DOS line endings)
+find eg/ -type f | xargs chmod -c -x
+find eg/ -type f | xargs perl -pi -e 's|^#!\s*/usr/local/bin/perl\S*|%{__perl}|'
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+%build
+perl Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
-%{_fixperms} $RPM_BUILD_ROOT/*
+%install
+rm -rf %{buildroot}
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+%{_fixperms} %{buildroot}
%check
make test
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
-%defattr(-,root,root,-)
-%doc Changes eg README TODO
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%doc Changes eg/ README TODO
+%{perl_vendorlib}/Regexp/
+%{_mandir}/man3/Regexp::Assemble.3*
%changelog
+* Thu Nov 27 2014 Paul Howarth <paul@xxxxxxxxxxxx> - 0.35-11
+- Add patch to fix POD errors (CPAN RT#85686)
+- Classify buildreqs by usage
+- General clean-up
+
* Thu Aug 28 2014 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 0.35-10
- Perl 5.20 rebuild
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
