From c79a533082f38cbe7df66af58a6d655d27bf0bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com> Date: Mon, 7 Dec 2015 17:13:53 +0100 Subject: 1.001 bump
--- .gitignore | 1 + ...000-Escape-non-quantifying-curly-brackets.patch | 60 ---------------------- perl-Log-Agent.spec | 10 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 66 deletions(-) delete mode 100644 Log-Agent-1.000-Escape-non-quantifying-curly-brackets.patch diff --git a/.gitignore b/.gitignore index 0f2fcfd..e5bbbf2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /Log-Agent-1.000.tar.gz +/Log-Agent-1.001.tar.gz diff --git a/Log-Agent-1.000-Escape-non-quantifying-curly-brackets.patch b/Log-Agent-1.000-Escape-non-quantifying-curly-brackets.patch deleted file mode 100644 index 212c495..0000000 --- a/Log-Agent-1.000-Escape-non-quantifying-curly-brackets.patch +++ /dev/null @@ -1,60 +0,0 @@ -From e679ea177cb2570488a7108d7a16e866eecde0fe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com> -Date: Thu, 18 Jun 2015 15:45:13 +0200 -Subject: [PATCH] Escape non-quantifying curly brackets -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since perl 5.22.0, literal curly bracket in a regualar expression -raises a warning. This patch fixes these typos. - -CPAN RT#105329 - -Signed-off-by: Petr Písař <ppi...@redhat.com> ---- - Agent/Tag/Caller.pm | 8 ++++---- - Agent/Tag/Priority.pm | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Agent/Tag/Caller.pm b/Agent/Tag/Caller.pm -index 89e1ea9..1bf7aff 100644 ---- a/Agent/Tag/Caller.pm -+++ b/Agent/Tag/Caller.pm -@@ -178,13 +178,13 @@ sub string { - my $display = $self->display; - if ($display) { - $display =~ s/\$pack(?:age)?\b/$package/g; -- $display =~ s/\${pack(?:age)?}/$package/g; -+ $display =~ s/\$\{pack(?:age)?\}/$package/g; - $display =~ s/\$file(?:name)?\b/$filename/g; -- $display =~ s/\${file(?:name)?}/$filename/g; -+ $display =~ s/\$\{file(?:name)?\}/$filename/g; - $display =~ s/\$line\b/$line/g; -- $display =~ s/\${line}/$line/g; -+ $display =~ s/\$\{line\}/$line/g; - $display =~ s/\$sub(?:routine)?\b/$subroutine/g; -- $display =~ s/\${sub(?:routine)?}/$subroutine/g; -+ $display =~ s/\$\{sub(?:routine)?\}/$subroutine/g; - } else { - my @show = map { $caller[$_] } @{$self->indices}; - my $format = $self->format || ($self->postfix ? "[%a]" : "(%a)"); -diff --git a/Agent/Tag/Priority.pm b/Agent/Tag/Priority.pm -index 2013ad5..8fb6ea6 100644 ---- a/Agent/Tag/Priority.pm -+++ b/Agent/Tag/Priority.pm -@@ -81,9 +81,9 @@ sub make { - # - - $display =~ s/\$priority\b/$priority/g; -- $display =~ s/\${priority}/$priority/g; -+ $display =~ s/\$\{priority\}/$priority/g; - $display =~ s/\$level\b/$level/g; -- $display =~ s/\${level}/$level/g; -+ $display =~ s/\$\{level\}/$level/g; - - # - # Now create the constant tag string. --- -2.1.0 - diff --git a/perl-Log-Agent.spec b/perl-Log-Agent.spec index 760e48e..e9c5e7f 100644 --- a/perl-Log-Agent.spec +++ b/perl-Log-Agent.spec @@ -2,15 +2,13 @@ %bcond_with datum Name: perl-Log-Agent -Version: 1.000 +Version: 1.001 Release: 1%{?dist} Summary: Logging agent License: Artistic 2.0 Group: Development/Libraries URL: http://search.cpan.org/dist/Log-Agent/ Source0: http://www.cpan.org/authors/id/M/MR/MROGASKI/Log-Agent-%{version}.tar.gz -# Fix typos in regular expressions, CPAN RT#105329 -Patch0: Log-Agent-1.000-Escape-non-quantifying-curly-brackets.patch BuildArch: noarch BuildRequires: findutils BuildRequires: make @@ -78,7 +76,6 @@ Sys::Syslog interface. %prep %setup -q -n Log-Agent-%{version} -%patch0 -p1 %build perl Makefile.PL INSTALLDIRS=vendor @@ -93,7 +90,7 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; make test %files -%doc README +%doc CHANGELOG.md README %{perl_vendorlib}/* %{_mandir}/man3/* # Carp-Datum @@ -125,5 +122,8 @@ make test %{_mandir}/man3/Log::Agent::Driver::Syslog.* %changelog +* Mon Dec 07 2015 Petr Pisar <ppi...@redhat.com> - 1.001-1 +- 1.001 bump + * Thu Jun 18 2015 Petr Pisar <ppi...@redhat.com> 1.000-1 - Specfile autogenerated by cpanspec 1.78. diff --git a/sources b/sources index 5204ee1..90ce6b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8c8c335cdeca0a7c8bb92e22028403e Log-Agent-1.000.tar.gz +0f5be2989d20a798e1db02585ecfd561 Log-Agent-1.001.tar.gz -- cgit v0.11.2 http://pkgs.fedoraproject.org/cgit/perl-Log-Agent.git/commit/?h=f23&id=c79a533082f38cbe7df66af58a6d655d27bf0bb3 -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@lists.fedoraproject.org http://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org