diff --git a/perl-5.14.0-cflags.patch b/perl-5.14.0-cflags.patch deleted file mode 100644 index 1155a57..0000000 --- a/perl-5.14.0-cflags.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up Net-Pcap-0.16/Makefile.PL.orig Net-Pcap-0.16/Makefile.PL ---- Net-Pcap-0.16/Makefile.PL.orig 2007-12-24 00:06:15.000000000 +0100 -+++ Net-Pcap-0.16/Makefile.PL 2011-06-17 12:11:26.970169054 +0200 -@@ -7,6 +7,7 @@ use File::Spec; - - - my ($DEBUG, %options, $DEVNULL, $is_Win32, $has_Win32); -+$DEBUG=1; - - if ($^O eq 'MSWin32') { - $options{LIBS} = '-lwpcap'; -@@ -22,7 +23,7 @@ elsif ($^O eq 'cygwin') { - cygwin_pcap_headers(); - } - else { -- $options{CCFLAGS} = '-Wall -Wwrite-strings' if $Config{ccname} eq 'gcc' and $] >= 5.006; -+ $options{CCFLAGS} = "-Wall -Wwrite-strings $Config{ccflags}" if $Config{ccname} eq 'gcc' and $] >= 5.006; - $options{LIBS} = '-lpcap'; - } - diff --git a/perl-Net-Pcap-ccflags.patch b/perl-Net-Pcap-ccflags.patch new file mode 100644 index 0000000..1155a57 --- /dev/null +++ b/perl-Net-Pcap-ccflags.patch @@ -0,0 +1,20 @@ +diff -up Net-Pcap-0.16/Makefile.PL.orig Net-Pcap-0.16/Makefile.PL +--- Net-Pcap-0.16/Makefile.PL.orig 2007-12-24 00:06:15.000000000 +0100 ++++ Net-Pcap-0.16/Makefile.PL 2011-06-17 12:11:26.970169054 +0200 +@@ -7,6 +7,7 @@ use File::Spec; + + + my ($DEBUG, %options, $DEVNULL, $is_Win32, $has_Win32); ++$DEBUG=1; + + if ($^O eq 'MSWin32') { + $options{LIBS} = '-lwpcap'; +@@ -22,7 +23,7 @@ elsif ($^O eq 'cygwin') { + cygwin_pcap_headers(); + } + else { +- $options{CCFLAGS} = '-Wall -Wwrite-strings' if $Config{ccname} eq 'gcc' and $] >= 5.006; ++ $options{CCFLAGS} = "-Wall -Wwrite-strings $Config{ccflags}" if $Config{ccname} eq 'gcc' and $] >= 5.006; + $options{LIBS} = '-lpcap'; + } + diff --git a/perl-Net-Pcap.spec b/perl-Net-Pcap.spec index e10cc45..8015739 100644 --- a/perl-Net-Pcap.spec +++ b/perl-Net-Pcap.spec @@ -1,6 +1,6 @@ Name: perl-Net-Pcap Version: 0.16 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Interface to pcap(3) LBL packet capture library Group: Development/Libraries @@ -9,8 +9,8 @@ URL: http://search.cpan.org/dist/Net-Pcap/ Source0: http://search.cpan.org/CPAN/authors/id/S/SA/SAPER/Net-Pcap-%{version}.tar.gz # https://rt.cpan.org/Ticket/Display.html?id=55163 Patch0: net-pcap-0.16-eg-pcapdump.patch -# see http://rt.perl.org/rt3/Public/Bug/Display.html?id=89478 -Patch1: perl-5.14.0-cflags.patch +# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522 +Patch1: perl-Net-Pcap-ccflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker), perl(Test::More) @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 18 2011 Iain Arnell 0.16-12 +- rename patch and clarify that it's EU:MM related, not EU::CB + * Fri Jun 17 2011 Iain Arnell 0.16-11 - patch to workaround ExtUtils::CBuilder behavior change see http://rt.perl.org/rt3/Public/Bug/Display.html?id=89478