# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1390413122 -3600
# Node ID f0da6998c61ad8dc6370744170fdc11a99f64e15
# Parent  d42403a4ec05f73ec6703d04e7f1db5e548dc67d
Update version and integrate additional IPv4 and IPv6 country databases.

diff -r d42403a4ec05 -r f0da6998c61a geoip/geoip.spec
--- a/geoip/geoip.spec	Tue Jul 02 21:40:10 2013 +0200
+++ b/geoip/geoip.spec	Wed Jan 22 18:52:02 2014 +0100
@@ -22,7 +22,7 @@
 ##
 
 #   package version
-%define       V_api_c   1.4.8
+%define       V_api_c   1.6.0
 %define       V_api_pl  1.40
 
 #   package information
@@ -45,6 +45,8 @@
 Source0:      http://geolite.maxmind.com/download/geoip/api/c/GeoIP-%{V_api_c}.tar.gz
 Source1:      http://www.cpan.org/modules/by-module/Geo/Geo-IP-%{V_api_pl}.tar.gz
 Source2:      http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+Source3:      http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
+Source4:      http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz
 
 #   build information
 Prefix:       %{l_prefix}
@@ -87,7 +89,12 @@
 
 %prep
     %setup -q -n GeoIP-%{V_api_c}
-    ( cd data && %{l_gzip} -cd %{SOURCE2} >GeoLiteCity.dat) || exit $?
+    %{l_shtool} mkdir -f -p -m 755 data
+    ( cd data && \
+      %{l_gzip} -cd %{SOURCE2} >GeoLiteCityIPv4.dat
+      %{l_gzip} -cd %{SOURCE3} >GeoLiteCountryIPv4.dat
+      %{l_gzip} -cd %{SOURCE4} >GeoLiteCountryIPv6.dat
+    ) || exit $?
 %if "%{with_perl}" == "yes"
     %setup -q -T -D -a 1 -n GeoIP-%{V_api_c}
 %endif
@@ -126,10 +133,11 @@
     rm -rf $RPM_BUILD_ROOT
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix} \
         $RPM_BUILD_ROOT%{l_prefix}/man \
-        $RPM_BUILD_ROOT%{l_prefix}/man/man1
+        $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
+        $RPM_BUILD_ROOT%{l_prefix}/share/GeoIP
     %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT"
     %{l_shtool} install -c -m 644 \
-        data/GeoLiteCity.dat $RPM_BUILD_ROOT%{l_prefix}/share/GeoIP
+        data/*.dat $RPM_BUILD_ROOT%{l_prefix}/share/GeoIP/
 %if "%{with_perl}" == "yes"
     %{l_prefix}/bin/perl-openpkg -d Geo-IP-%{V_api_pl} install
     %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup