X-Git-Url: http://git.pld-linux.org/?p=packages%2FGeoIP-db-Country.git;a=blobdiff_plain;f=GeoIP-db-Country.spec;h=29667721d3318c302e07fc13466aefd20f55f4bd;hp=641bbb0164e32a3bfa5cf4352e4c2a552c30272c;hb=2199cf249c2d81965b84944de949bec1cc55644d;hpb=e5288fe19ed0327d61b9a4f7eb118052f9f99f91

diff --git a/GeoIP-db-Country.spec b/GeoIP-db-Country.spec
index 641bbb0..2966772 100644
--- a/GeoIP-db-Country.spec
+++ b/GeoIP-db-Country.spec
@@ -2,16 +2,16 @@ Summary:	GeoLite Country - Country database for GeoIP
 Summary(pl.UTF-8):	GeoLite Country - baza danych krajów dla GeoIP
 Name:		GeoIP-db-Country
 # Updated every month:
-Version:	2012.09.05
+Version:	2016.09.06
 Release:	1
-License:	OPEN DATA LICENSE (see LICENSE.txt)
+License:	CC 3.0 BY-SA
 Group:		Applications/Databases
-Source0:	http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
-# Source0-md5:	c053f11cb8383fb8f4826591b0cbae3d
-Source1:	http://www.maxmind.com/download/geoip/database/LICENSE.txt
-# Source1-md5:	a1381bd1aa0a0c91dc31b3f1e847cf4a
-URL:		http://www.maxmind.com/app/geolitecountry
-Requires:	GeoIP-libs
+Source0:	http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz?/GeoIP-%{version}.dat.gz
+# Source0-md5:	2e3c2c78f3e753768f3f8dfd32b157c0
+Source1:	http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz?/GeoIPv6-%{version}.dat.gz
+# Source1-md5:	643aa0dfedc54a276f87f7f0d3b9c500
+URL:		http://dev.maxmind.com/geoip/legacy/geolite/
+Requires:	GeoIP-libs >= 1.4.5-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -29,16 +29,21 @@ jest tak dokładna. Jeśli wymagana jest większa dokładność, GeoIP
 Country jest zamiennikiem GeoLite Country.
 
 Informacja licencyjna: ten produkt zawiera dane GeoLite stworzone
-przez MaxWind, dostępne z <http://www.maxwind.com/>.
+przez MaxMind, dostępne z <http://www.maxmind.com/>.
 
 %prep
 %setup -qcT
 cp -p %{SOURCE0} .
 cp -p %{SOURCE1} .
 
-gunzip GeoIP.dat.gz
-
-ver=$(TZ=GMT stat -c '%y' GeoIP.dat | awk '{print $1}' | tr - .)
+gzip -d GeoIP-%{version}.dat.gz GeoIPv6-%{version}.dat.gz
+dt4=$(TZ=GMT stat -c '%y' GeoIP-%{version}.dat | awk '{print $1}' | tr - .)
+dt5=$(TZ=GMT stat -c '%y' GeoIP-%{version}.dat | awk '{print $1}' | tr - .)
+if [ "$(echo $dt4 | tr -d .)" -gt "$(echo $dt6 | tr -d .)" ]; then
+	ver=$dt4
+else
+	ver=$dt6
+fi
 if [ "$ver" != %{version} ]; then
 	exit 1
 fi
@@ -46,12 +51,12 @@ fi
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/GeoIP
-cp -p GeoIP.dat $RPM_BUILD_ROOT%{_datadir}/GeoIP
+cp -p GeoIP-%{version}.dat $RPM_BUILD_ROOT%{_datadir}/GeoIP/GeoIP.dat
+cp -p GeoIPv6-%{version}.dat $RPM_BUILD_ROOT%{_datadir}/GeoIP/GeoIPv6.dat
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.txt
 %{_datadir}/GeoIP/*.dat