[perl-Geo-IP] Rework the patches

[Mathieu Bridon]

commit bee2e625c719df8bdf22a141aa594be8e7e8e638
Author: Mathieu Bridon <bochecha at fedoraproject.org>
Date:   Thu Oct 25 12:40:08 2012 +0800

    Rework the patches
    
    They are still needed for the new release, but one needed to be
    updated slightly.
    
    So while I was there, I added some comments about why they are needed.

 Geo-IP-1.28-example.diff                           |    8 ----
 Geo-IP-1.28-yahoo-namelookuptest.diff              |   16 ---------
 ...IP-1.40-Drop-failing-namelookup-unit-test.patch |   35 ++++++++++++++++++++
 Geo-IP-1.40-Fix-shebangs-in-example-files.patch    |   33 ++++++++++++++++++
 perl-Geo-IP.spec                                   |    8 ++--
 5 files changed, 72 insertions(+), 28 deletions(-)
---
diff --git a/Geo-IP-1.40-Drop-failing-namelookup-unit-test.patch b/Geo-IP-1.40-Drop-failing-namelookup-unit-test.patch
new file mode 100644
index 0000000..05e318d
--- /dev/null
+++ b/Geo-IP-1.40-Drop-failing-namelookup-unit-test.patch
@@ -0,0 +1,35 @@
+From 2e930405d97b2f8518e18bbd933a41cb9bfd4603 Mon Sep 17 00:00:00 2001
+From: Mathieu Bridon <bochecha at fedoraproject.org>
+Date: Wed, 24 Oct 2012 17:52:01 +0800
+Subject: [PATCH] Drop failing namelookup unit test
+
+This unit tests needs a network connection, to resolve the
+domain name.
+
+That can't work on the Fedora builders as they don't have any
+network connection available.
+---
+ t/2_namelookup.t |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/t/2_namelookup.t b/t/2_namelookup.t
+index 28532a3..328073b 100644
+--- a/t/2_namelookup.t
++++ b/t/2_namelookup.t
+@@ -5,7 +5,7 @@ use Test;
+ 
+ $^W = 1;
+ 
+-BEGIN { plan tests => 11 }
++BEGIN { plan tests => 10 }
+ 
+ use Geo::IP;
+ 
+@@ -29,4 +29,3 @@ __DATA__
+ 194.244.83.2	IT
+ 203.15.106.23	AU
+ 196.31.1.1	ZA
+-yahoo.com	US
+-- 
+1.7.7.6
+
diff --git a/Geo-IP-1.40-Fix-shebangs-in-example-files.patch b/Geo-IP-1.40-Fix-shebangs-in-example-files.patch
new file mode 100644
index 0000000..ed7c779
--- /dev/null
+++ b/Geo-IP-1.40-Fix-shebangs-in-example-files.patch
@@ -0,0 +1,33 @@
+From 796fb7e692b0778d3fda02b6a5ed14591d10c667 Mon Sep 17 00:00:00 2001
+From: Mathieu Bridon <bochecha at fedoraproject.org>
+Date: Wed, 24 Oct 2012 17:01:52 +0800
+Subject: [PATCH] Fix shebangs in example files
+
+---
+ example/netspeed.pl     |    2 +-
+ example/netspeedcell.pl |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/example/netspeed.pl b/example/netspeed.pl
+index a68c010..890e480 100755
+--- a/example/netspeed.pl
++++ b/example/netspeed.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ use Geo::IP;
+ 
+diff --git a/example/netspeedcell.pl b/example/netspeedcell.pl
+index 74905c9..c9d2928 100755
+--- a/example/netspeedcell.pl
++++ b/example/netspeedcell.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ use Geo::IP;
+ 
+-- 
+1.7.7.6
+
diff --git a/perl-Geo-IP.spec b/perl-Geo-IP.spec
index 0b4f4ac..573adba 100644
--- a/perl-Geo-IP.spec
+++ b/perl-Geo-IP.spec
@@ -7,8 +7,8 @@ License:          GPL+ or Artistic
 
 Source0:          http://search.cpan.org/CPAN/authors/id/B/BO/BORISZ/Geo-IP-%{version}.tar.gz
 
-Patch0:           Geo-IP-1.28-yahoo-namelookuptest.diff
-Patch1:           Geo-IP-1.28-example.diff
+Patch0:           Geo-IP-1.40-Drop-failing-namelookup-unit-test.patch
+Patch1:           Geo-IP-1.40-Fix-shebangs-in-example-files.patch
 
 BuildRequires:    GeoIP-devel
 BuildRequires:    perl(ExtUtils::MakeMaker)
@@ -28,8 +28,8 @@ similar modules.
 %prep
 %setup -q -n Geo-IP-%{version}
 
-%patch0 -p0 -b .namelookup
-%patch1 -p0
+%patch0 -p1
+%patch1 -p1
 
 
 %build