[perl-Test-Vars] Fix compatibility with Perl 5.16 (CPAN RT#72133)

[Paul Howarth]

commit 0286f96139d758b73c4967a2fe9cd1718903ec6e
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Jun 13 00:15:19 2012 +0100

    Fix compatibility with Perl 5.16 (CPAN RT#72133)
    
    - Fix compatibility with Perl 5.16 (CPAN RT#72133)
    - Don't need to remove empty directories from buildroot

 Test-Vars-perl516.patch |   21 +++++++++++++++++++++
 perl-Test-Vars.spec     |   11 +++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/Test-Vars-perl516.patch b/Test-Vars-perl516.patch
new file mode 100644
index 0000000..72ff9f6
--- /dev/null
+++ b/Test-Vars-perl516.patch
@@ -0,0 +1,21 @@
+https://rt.perl.org/rt3/Ticket/Display.html?id=102822
+https://rt.cpan.org/Public/Bug/Display.html?id=72133
+https://rt.cpan.org/Public/Bug/Display.html?id=77438
+
+--- lib/Test/Vars.pm
++++ lib/Test/Vars.pm
+@@ -196,9 +196,13 @@
+ my $op_entereval; # string eval
+ my @op_svusers;
+ BEGIN{
+-    foreach my $op(qw(padsv padav padhv aelemfast)){
++    foreach my $op(qw(padsv padav padhv)){
+         $padops[B::opnumber($op)]++;
+     }
++    # blead commit 93bad3fd55489cbd split aelemfast into two ops.
++    # Prior to that, 'aelemfast' handled lexicals too.
++    my $aelemfast = B::opnumber('aelemfast_lex');
++    $padops[$aelemfast == -1 ? B::opnumber('aelemfast') : $aelemfast]++;
+ 
+     $op_anoncode = B::opnumber('anoncode');
+     $padops[$op_anoncode]++;
diff --git a/perl-Test-Vars.spec b/perl-Test-Vars.spec
index 61a632e..3c6e9f8 100644
--- a/perl-Test-Vars.spec
+++ b/perl-Test-Vars.spec
@@ -1,11 +1,12 @@
 Name:		perl-Test-Vars
 Version:	0.001
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Detects unused variables
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Test-Vars/
 Source0:	http://search.cpan.org/CPAN/authors/id/G/GF/GFUJI/Test-Vars-%{version}.tar.gz
+Patch0:		Test-Vars-perl516.patch
 BuildArch:	noarch
 BuildRequires:	perl >= 4:5.10.0
 BuildRequires:	perl(B)
@@ -25,6 +26,9 @@ Test::Vars finds unused variables in order to keep the source code tidy.
 %prep
 %setup -q -n Test-Vars-%{version}
 
+# Fix compatibility with Perl 5.16 (CPAN RT#72133)
+%patch0
+
 # Placate rpmlint about script interpreters in examples
 sed -i -e '1s|^#!perl|#!/usr/bin/perl|' example/*.t
 
@@ -35,7 +39,6 @@ make %{?_smp_mflags}
 %install
 make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} \;
-find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null
 %{_fixperms} %{buildroot}
 
 %check
@@ -48,6 +51,10 @@ make test TEST_FILES="xt/*.t"
 %{_mandir}/man3/Test::Vars.3pm*
 
 %changelog
+* Tue Jun 12 2012 Paul Howarth <paul at city-fan.org> - 0.001-5
+- Fix compatibility with Perl 5.16 (CPAN RT#72133)
+- Don't need to remove empty directories from buildroot
+
 * Tue Jun 12 2012 Petr Pisar <ppisar at redhat.com> - 0.001-4
 - Perl 5.16 rebuild