[GeoIP] Update UTF8 patch

[Paul Howarth]

commit e8df18e375696c157b96bf4cf83874254c1b70ce
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Jun 13 10:31:50 2013 +0100

    Update UTF8 patch

 GeoIP-1.5.0-UTF8.patch => GeoIP-1.5.1-UTF8.patch |   31 +++++++++++++++++----
 GeoIP.spec                                       |    6 +++-
 2 files changed, 29 insertions(+), 8 deletions(-)
---
diff --git a/GeoIP-1.5.0-UTF8.patch b/GeoIP-1.5.1-UTF8.patch
similarity index 61%
rename from GeoIP-1.5.0-UTF8.patch
rename to GeoIP-1.5.1-UTF8.patch
index dcc9c38..e72f48d 100644
--- a/GeoIP-1.5.0-UTF8.patch
+++ b/GeoIP-1.5.1-UTF8.patch
@@ -1,15 +1,15 @@
-diff -U0 GeoIP-1.5.0/ChangeLog.orig GeoIP-1.5.0/ChangeLog
---- GeoIP-1.5.0/ChangeLog.orig	2011-06-24 14:44:56.000000000 +0100
-+++ GeoIP-1.5.0/ChangeLog	2011-06-27 09:06:16.190029375 +0100
-@@ -137,2 +137,2 @@
+diff -U0 ./ChangeLog.utf8 ./ChangeLog
+--- ./ChangeLog.utf8	2013-03-23 02:26:09.000000000 +0000
++++ ./ChangeLog	2013-06-13 09:11:18.640720014 +0100
+@@ -185,2 +185,2 @@
 -	* Fixed a typo in the geoipupdate(1) manpage and also an non-existent path on Debian (Patrick Matthäi)
 -	* Fixes two little format errors (hyphen used as minus sign) in both manpages (Patrick Matthäi)
 +	* Fixed a typo in the geoipupdate(1) manpage and also an non-existent path on Debian (Patrick Matthäi)
 +	* Fixes two little format errors (hyphen used as minus sign) in both manpages (Patrick Matthäi)
-@@ -249 +249 @@
+@@ -297 +297 @@
 -	* Fixed build issue when using --as-needed flag (Diego 'Flameeyes' Pettenò)
 +	* Fixed build issue when using --as-needed flag (Diego 'Flameeyes' Pettenò)
-@@ -395,7 +395,7 @@
+@@ -443,7 +443,7 @@
 -		 1) Use a single buf ptr inside the loops.
 -		    Set to the stack buffer or the cached memory the start of the function.
 -		 2) Unroll the i=0,1 loop to allow constant folding.
@@ -24,3 +24,22 @@ diff -U0 GeoIP-1.5.0/ChangeLog.orig GeoIP-1.5.0/ChangeLog
 +		    (I've already done the above changes see attached function.)
 +		    With gcc -O2 calculating x[0] and x[1] for STANDARD_RECORD_LENGTH now
 +		    only takes 15 (was > 100) i80x86 instructions with 6 byte accesses of RAM.                 4) only calculate x[0], x[1] when needed, may be a bigger win
+diff -up ./TODO.utf8 ./TODO
+--- ./TODO.utf8	2013-03-23 02:26:09.000000000 +0000
++++ ./TODO	2013-06-13 09:16:19.274926385 +0100
+@@ -9,12 +9,12 @@ Maurice Cinquini
+ 
+ *** ifndef WIN32 on netdb.h ? ***
+ In GeoIPCity.c you don't "#ifndef WIN32" the netdb.h include,
+-but in GeoIP.c you do.  Which one is right?
++but in GeoIP.c you do.  Which one is right?
+ 
+ *** Warnings in GeoIP-1.2.1 before I made changes ***
+ GeoIPUpdate.c:73: warning: implicit declaration of function `_setup_dbfilename'
+-    I suggest a GeoIP_private.h file to include prototypes for
+-    _setup_dbfilename and other private functions also used by GeoIPCity.c
++    I suggest a GeoIP_private.h file to include prototypes for
++    _setup_dbfilename and other private functions also used by GeoIPCity.c
+ 
+ *** Drop the GeoIP_*_by_addr API calls ***
+ And now that I think of it, why do you need a seperate
diff --git a/GeoIP.spec b/GeoIP.spec
index 658aa99..99487be 100644
--- a/GeoIP.spec
+++ b/GeoIP.spec
@@ -14,7 +14,7 @@ Source2:	fetch-geoipdata-city.pl
 Source3:	fetch-geoipdata.pl
 Source5:	geoipupdate.cron
 Patch1:		GeoIP-1.5.0-exitcode.patch
-Patch10:	GeoIP-1.5.0-UTF8.patch
+Patch10:	GeoIP-1.5.1-UTF8.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	zlib-devel
 Obsoletes:	geoip < %{version}-%{release}
@@ -55,6 +55,7 @@ Development headers and static libraries for building GeoIP-based applications.
 %setup -q
 
 %patch1 -p1 -b .exitcode
+
 # Recode docs as UTF-8
 %patch10 -p1 -b .utf8
 
@@ -153,7 +154,8 @@ geoipupdate > /dev/null && \
 
 %changelog
 * Wed Jun 12 2013 Philip Prindeville <philipp at fedoraproject.org> - 1.5.1-1
-- Bump to version 1.5.1.
+- Bump to version 1.5.1
+- Update UTF8 patch
 
 * Mon Jun 10 2013 Philip Prindeville <philipp at fedoraproject.org> - 1.5.0-7
 - Annotate conflict with geoip-lite package.