0.94 bump

This commit is contained in:
Petr Písař 2017-08-10 15:42:51 +02:00
parent 63bd0080ee
commit 3c125d662d
3 changed files with 8 additions and 91 deletions

View File

@ -1,40 +0,0 @@
From ae5f5addc848a6e80707f625db58cbb9a633aea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Wed, 6 May 2015 10:10:46 +0200
Subject: [PATCH] Upgrade to 0.92
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
lib/Filter/Simple.pm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/Filter/Simple.pm b/lib/Filter/Simple.pm
index 4b15e55..8212919 100644
--- a/lib/Filter/Simple.pm
+++ b/lib/Filter/Simple.pm
@@ -4,7 +4,7 @@ use Text::Balanced ':ALL';
use vars qw{ $VERSION @EXPORT };
-$VERSION = '0.91';
+$VERSION = '0.92';
use Filter::Util::Call;
use Carp;
@@ -119,8 +119,8 @@ sub gen_std_filter_for {
}
if ($type =~ /^code/) {
my $count = 0;
- local $placeholder = qr/\Q$;\E(\C{4})\Q$;\E/;
- my $extractor = qr/\Q$;\E(\C{4})\Q$;\E/;
+ local $placeholder = qr/\Q$;\E(.{4})\Q$;\E/s;
+ my $extractor = qr/\Q$;\E(.{4})\Q$;\E/s;
$_ = join "",
map { ref $_ ? $;.pack('N',$count++).$; : $_ }
@components;
--
2.1.0

View File

@ -1,39 +0,0 @@
From 7d77f251bb8b41132a93c9f6a4bfc8c650316f18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 11 May 2017 10:45:27 +0200
Subject: [PATCH] Upgrade to 0.93
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Unbundled from perl-5.25.12.
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
lib/Filter/Simple.pm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/Filter/Simple.pm b/lib/Filter/Simple.pm
index 8212919..44a5f73 100644
--- a/lib/Filter/Simple.pm
+++ b/lib/Filter/Simple.pm
@@ -4,7 +4,7 @@ use Text::Balanced ':ALL';
use vars qw{ $VERSION @EXPORT };
-$VERSION = '0.92';
+$VERSION = '0.93';
use Filter::Util::Call;
use Carp;
@@ -198,6 +198,7 @@ sub gen_filter_import {
if ($terminator{terminator} &&
m/$terminator{terminator}/) {
$lastline = $_;
+ $count++;
last;
}
$data .= $_;
--
2.9.3

View File

@ -1,19 +1,14 @@
%global base_version 0.91
Name: perl-Filter-Simple
Version: 0.93
Release: 394%{?dist}
Version: 0.94
Release: 1%{?dist}
Summary: Simplified Perl source filtering
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Filter-Simple/
Source0: http://www.cpan.org/authors/id/S/SM/SMUELLER/Filter-Simple-%{base_version}.tar.gz
# Unbundled from perl 5.21.11
Patch0: Filter-Simple-0.91-Upgrade-to-0.92.patch
# Unbunlded from perl 5.25.12
Patch1: Filter-Simple-0.92-Upgrade-to-0.93.patch
Source0: http://www.cpan.org/authors/id/S/SM/SMUELLER/Filter-Simple-%{version}.tar.gz
BuildArch: noarch
BuildRequires: make
BuildRequires: perl-interpreter
BuildRequires: perl-generators
BuildRequires: perl-interpreter
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
BuildRequires: perl(strict)
# Run-time:
@ -37,9 +32,7 @@ The Filter::Simple Perl module provides a simplified interface to
Filter::Util::Call; one that is sufficient for most common cases.
%prep
%setup -q -n Filter-Simple-%{base_version}
%patch0 -p1
%patch1 -p1
%setup -q -n Filter-Simple-%{version}
%build
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
@ -58,6 +51,9 @@ make test
%{_mandir}/man3/*
%changelog
* Thu Aug 10 2017 Petr Pisar <ppisar@redhat.com> - 0.94-1
- 0.94 bump
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.93-394
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild