rpms/perl-Devel-Profiler/devel perl-Devel-Profiler-perl510.patch, NONE, 1.1 perl-Devel-Profiler.spec, 1.2, 1.3

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/perl-Devel-Profiler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27540

Modified Files:
	perl-Devel-Profiler.spec 
Added Files:
	perl-Devel-Profiler-perl510.patch 
Log Message:
fix for perl 5.10

perl-Devel-Profiler-perl510.patch:

--- NEW FILE perl-Devel-Profiler-perl510.patch ---
diff -up Devel-Profiler-0.04/lib/Devel/Profiler.pm.BAD Devel-Profiler-0.04/lib/Devel/Profiler.pm
--- Devel-Profiler-0.04/lib/Devel/Profiler.pm.BAD	2008-03-07 14:20:17.000000000 -0500
+++ Devel-Profiler-0.04/lib/Devel/Profiler.pm	2008-03-07 14:21:03.000000000 -0500
@@ -151,9 +151,14 @@ sub scan {
             }
             
             # found a code ref?  then instrument it
-            instrument($pkg, $sym, $code) 
-              if defined($code = *{$glob}{CODE}) and ref $code eq 'CODE';
-              
+            if (ref \$glob ne 'GLOB') {
+                # Something stranger in the typeglob, which will expand to (at
+                # least) a prototype if we take a reference to it.
+                instrument($pkg, $sym, \&{"$pkg$sym"});
+            } else {
+                instrument($pkg, $sym, $code) 
+                    if defined($code = *{$glob}{CODE}) and ref $code eq 'CODE';
+            }            
         }
     }
 }
diff -up Devel-Profiler-0.04/t/09fcntl.t.BAD Devel-Profiler-0.04/t/09fcntl.t
--- Devel-Profiler-0.04/t/09fcntl.t.BAD	2008-03-07 14:21:11.000000000 -0500
+++ Devel-Profiler-0.04/t/09fcntl.t	2008-03-07 14:21:27.000000000 -0500
@@ -8,7 +8,14 @@ foo();
 END
 
 # make sure the call tree looks right
-check_tree(<<END, "checking tree");
+if ($] > 5.009) {
+    # Fcntl's constants are now directly defined, so constant() isn't called.
+    check_tree(<<END, "checking tree");
+main::foo
+END
+} else {
+    check_tree(<<END, "checking tree");
 main::foo
    Fcntl::constant
 END
+}


Index: perl-Devel-Profiler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Profiler/devel/perl-Devel-Profiler.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Devel-Profiler.spec	7 Mar 2008 01:59:39 -0000	1.2
+++ perl-Devel-Profiler.spec	7 Mar 2008 19:25:52 -0000	1.3
@@ -1,11 +1,12 @@
 Name:           perl-Devel-Profiler
 Version:        0.04
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl profiler compatible with dprofpp
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Devel-Profiler/
 Source0:        http://www.cpan.org/authors/id/S/SA/SAMTREGAR/Devel-Profiler-%{version}.tar.gz
+Patch0:         perl-Devel-Profiler-perl510.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q -n Devel-Profiler-%{version}
+%patch0 -p1
 
 # t/01basic fails.  This is the failing test:
 #
@@ -57,8 +59,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Mar  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.04-4
+- Fix for perl 5.10.0
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.04-3
-Rebuild for new perl
+- Rebuild for new perl
 
 * Mon Jul 16 2007 Steven Pritchard <steve at kspei.com> 0.04-2
 - BR ExtUtils::MakeMaker and Test::More.