From d17e6cc51aefc283b39997e8658f139a2c2d72ec Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mon, 18 Apr 2016 10:50:45 +0100 Subject: [PATCH] Update to 0.37 - New upstream release 0.37 - No code changes - Add a LICENCE; this activity is part of the CPAN PR Challenge 2016 - Update MANIFEST to include LICENCE file - Remove unicode characters from Changes and Changelog.ini files - Add TODO and update MANIFEST to note unicode issues - Add .gitignore to MANIFEST.SKIP - Simplify find command using -delete - Drop character coding patch, no longer needed --- .gitignore | 1 + Regexp-Assemble-0.36-utf8.patch | 40 --------------------------------- perl-Regexp-Assemble.spec | 28 ++++++++++++++++------- sources | 2 +- 4 files changed, 22 insertions(+), 49 deletions(-) delete mode 100644 Regexp-Assemble-0.36-utf8.patch diff --git a/.gitignore b/.gitignore index 3ef21d9..39f11d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /Regexp-Assemble-0.34.tar.gz /Regexp-Assemble-0.35.tar.gz /Regexp-Assemble-0.36.tgz +/Regexp-Assemble-0.37.tgz diff --git a/Regexp-Assemble-0.36-utf8.patch b/Regexp-Assemble-0.36-utf8.patch deleted file mode 100644 index d366d7c..0000000 --- a/Regexp-Assemble-0.36-utf8.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- Changes -+++ Changes -@@ -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 -- König. -+ König. - - 0.33 2008-06-07 14:40:57 UTC - - Tweaked _fastlex() to fix bug #36399 spotted by Yves -@@ -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 -- Rigaudière 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). -@@ -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 -- typo noted by David Rigaudière. -+ 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()? ---- examples/ircwatcher -+++ examples/ircwatcher -@@ -9,7 +9,7 @@ - # - # Try changing the read of STDIN to DATA for a quick demo. - # --# Acknowledgements to David "Sniper" Rigaudière 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 ea535a2..da88d27 100644 --- a/perl-Regexp-Assemble.spec +++ b/perl-Regexp-Assemble.spec @@ -1,12 +1,11 @@ Name: perl-Regexp-Assemble -Version: 0.36 -Release: 2%{?dist} +Version: 0.37 +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/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 @@ -45,9 +44,6 @@ that the individual REs match. %prep %setup -q -n Regexp-Assemble-%{version} -# Re-code docs as UTF8 -%patch0 - # Tidy up the examples (note that eg/file.3 is required to have DOS line endings) find examples/ -type f | xargs chmod -c -x find examples/ -type f | xargs perl -pi -e 's|^#!\s*/usr/local/bin/perl\S*|%{__perl}|' @@ -59,7 +55,7 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install DESTDIR=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} \; +find %{buildroot} -type f -name .packlist -delete %{_fixperms} %{buildroot} %check @@ -69,11 +65,27 @@ make test rm -rf %{buildroot} %files -%doc Changes examples/ README +%if 0%{?_licensedir:1} +%license LICENCE +%else +%doc LICENCE +%endif +%doc Changes examples/ README TODO %{perl_vendorlib}/Regexp/ %{_mandir}/man3/Regexp::Assemble.3* %changelog +* Mon Apr 18 2016 Paul Howarth - 0.37-1 +- Update to 0.37 + - No code changes + - Add a LICENCE; this activity is part of the CPAN PR Challenge 2016 + - Update MANIFEST to include LICENCE file + - Remove unicode characters from Changes and Changelog.ini files + - Add TODO and update MANIFEST to note unicode issues + - Add .gitignore to MANIFEST.SKIP +- Simplify find command using -delete +- Drop character coding patch, no longer needed + * Thu Feb 04 2016 Fedora Release Engineering - 0.36-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index c810a79..0a8d705 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -52ad88fd82ce92250631041d34492414 Regexp-Assemble-0.36.tgz +2f7f232642f0f30f69983ef1316ecb42 Regexp-Assemble-0.37.tgz