diff --git a/.gitignore b/.gitignore index a5b3d54..3ef21d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -Regexp-Assemble-0.34.tar.gz +/Regexp-Assemble-0.34.tar.gz /Regexp-Assemble-0.35.tar.gz +/Regexp-Assemble-0.36.tgz diff --git a/Regexp-Assemble-0.35-pod.patch b/Regexp-Assemble-0.35-pod.patch deleted file mode 100644 index fe2a034..0000000 --- a/Regexp-Assemble-0.35-pod.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- 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.36-utf8.patch similarity index 85% rename from Regexp-Assemble-0.35-utf8.patch rename to Regexp-Assemble-0.36-utf8.patch index c29e51e..d366d7c 100644 --- a/Regexp-Assemble-0.35-utf8.patch +++ b/Regexp-Assemble-0.36-utf8.patch @@ -1,6 +1,6 @@ --- Changes +++ Changes -@@ -7,7 +7,7 @@ Revision history for Perl extension Rege +@@ -29,7 +29,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 @@ -9,7 +9,7 @@ 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 +@@ -185,7 +185,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 @@ -18,7 +18,7 @@ - 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 +@@ -193,7 +193,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 @@ -27,8 +27,8 @@ - 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 +--- examples/ircwatcher ++++ examples/ircwatcher @@ -9,7 +9,7 @@ # # Try changing the read of STDIN to DATA for a quick demo. diff --git a/perl-Regexp-Assemble.spec b/perl-Regexp-Assemble.spec index 1617c95..9000395 100644 --- a/perl-Regexp-Assemble.spec +++ b/perl-Regexp-Assemble.spec @@ -1,16 +1,18 @@ Name: perl-Regexp-Assemble -Version: 0.35 -Release: 13%{?dist} +Version: 0.36 +Release: 1%{?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 -Patch0: Regexp-Assemble-0.35-utf8.patch -Patch1: Regexp-Assemble-0.35-pod.patch +Source0: http://www.cpan.org/authors/id/R/RS/RSAVAGE/Regexp-Assemble-%{version}.tgz +Patch0: Regexp-Assemble-0.36-utf8.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch # Module Build +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: make BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) # Module Runtime @@ -22,15 +24,16 @@ BuildRequires: perl(Storable) BuildRequires: perl(strict) BuildRequires: perl(Time::HiRes) BuildRequires: perl(vars) +BuildRequires: perl(warnings) # 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) # Runtime Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +Requires: perl(Carp) Requires: perl(Storable) Requires: perl(Time::HiRes) @@ -45,12 +48,9 @@ that the individual REs match. # Re-code docs as UTF8 %patch0 -# Fix POD errors (CPAN RT#85686) -%patch1 - # 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 examples/ -type f | xargs chmod -c -x +find examples/ -type f | xargs perl -pi -e 's|^#!\s*/usr/local/bin/perl\S*|%{__perl}|' %build perl Makefile.PL INSTALLDIRS=vendor @@ -69,11 +69,29 @@ make test rm -rf %{buildroot} %files -%doc Changes eg/ README TODO +%doc Changes examples/ README %{perl_vendorlib}/Regexp/ %{_mandir}/man3/Regexp::Assemble.3* %changelog +* Mon Aug 17 2015 Paul Howarth - 0.36-1 +- Update to 0.36 + - Ron Savage is now co-maintainer + - Move eg/ to examples/ + - Add examples/failure.01.pl from CPAN RT#104897 + - Move pod tests into xt/author/pod.t by cutting them out of t/00_basic.t + (CPAN RT#85686, CPAN RT#85209) + - Add repository https://github.com/ronsavage/Regexp-Assemble.git + - Fix some spelling errors in the pod (CPAN RT#84336) + - Move Assemble.pm into lib/Regexp/ + - Move the contents of the TODO file into the docs, and delete that file + - Rearrange pod, but not by running this module over it :-) + - Update Makefile.PL + - Add Changelog.ini + - Update MANIFEST.SKIP +- This release by RSAVAGE → update source URL +- Update character coding patch + * Thu Jun 18 2015 Fedora Release Engineering - 0.35-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index c5e1a15..c810a79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -315796ece5bfb69b166846ced911cf0e Regexp-Assemble-0.35.tar.gz +52ad88fd82ce92250631041d34492414 Regexp-Assemble-0.36.tgz