diff --git a/perl-Devel-Cycle-1.11-512.patch b/perl-Devel-Cycle-1.11-512.patch new file mode 100644 index 0000000..119f828 --- /dev/null +++ b/perl-Devel-Cycle-1.11-512.patch @@ -0,0 +1,15 @@ +diff --git a/lib/Devel/Cycle.pm b/lib/Devel/Cycle.pm +index 19d3d63..2c5fdd1 100644 +--- a/lib/Devel/Cycle.pm ++++ b/lib/Devel/Cycle.pm +@@ -215,7 +215,9 @@ sub _format_reference { + sub _get_type { + my $thingy = shift; + return unless ref $thingy; +- return 'SCALAR' if UNIVERSAL::isa($thingy,'SCALAR') || UNIVERSAL::isa($thingy,'REF'); ++ return 'SCALAR' if UNIVERSAL::isa($thingy,'SCALAR') || ++ UNIVERSAL::isa($thingy,'REF') || ++ UNIVERSAL::isa($thingy,'Regexp'); + return 'ARRAY' if UNIVERSAL::isa($thingy,'ARRAY'); + return 'HASH' if UNIVERSAL::isa($thingy,'HASH'); + return 'CODE' if UNIVERSAL::isa($thingy,'CODE'); diff --git a/perl-Devel-Cycle.spec b/perl-Devel-Cycle.spec index 4b0a66f..a643704 100644 --- a/perl-Devel-Cycle.spec +++ b/perl-Devel-Cycle.spec @@ -1,12 +1,12 @@ Name: perl-Devel-Cycle Version: 1.11 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Find memory cycles in objects License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Devel-Cycle/ Source0: http://www.cpan.org/authors/id/L/LD/LDS/Devel-Cycle-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: perl-Devel-Cycle-1.11-512.patch BuildArch: noarch BuildRequires: perl(PadWalker) >= 1.0 BuildRequires: perl(ExtUtils::MakeMaker) @@ -21,34 +21,31 @@ based memory management, circular references will cause memory leaks. %prep %setup -q -n Devel-Cycle-%{version} +%patch0 -p1 -b .512 %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT - -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT - -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; - -%{_fixperms} $RPM_BUILD_ROOT/* +make pure_install PERL_INSTALL_ROOT=%{buildroot} +find %{buildroot} -type f -name .packlist -exec rm -f {} \; +find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; +%{_fixperms} %{buildroot}/* %check make test -%clean -rm -rf $RPM_BUILD_ROOT - %files -%defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Mon Nov 28 2011 Petr Šabata - 1.11-8 +- Fix a Perl 5.12 incompatibility (#757274, RT #56681) +- Remove BuildRoot and defattr + * Sun Jun 19 2011 Marcela Mašláňová - 1.11-7 - Perl mass rebuild