X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=GeoIP-db-Country.spec;h=e9ee3c6d1bc111893620e224a77f7f7f1af95e13;hb=67e9192d6a5c2c323b42be5bb3bc2e1552b944e2;hp=fb49d469ba876af92aa80879c00bf53b528c2681;hpb=49e577234360b866fe88ad731d11a28d8c9d5603;p=packages%2FGeoIP-db-Country.git

diff --git a/GeoIP-db-Country.spec b/GeoIP-db-Country.spec
index fb49d46..e9ee3c6 100644
--- a/GeoIP-db-Country.spec
+++ b/GeoIP-db-Country.spec
@@ -2,26 +2,20 @@ 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:	2009.02.02
+Version:	2015.05.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:	3867f3d6d15019fe772c0e03aab0368b
-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:	b38ed07a2130dd843cb95b5f2624af61
+Source1:	http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz?/GeoIPv6-%{version}.dat.gz
+# Source1-md5:	ad49fd7d3715dca6ef94e91314babebe
+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)
 
 %description
-GeoIP is a C library that enables the user to find the country that
-any IP address or hostname originates from. It uses a file based
-database that is accurate as of March 2003. This database simply
-contains IP blocks as keys, and countries as values. This database
-should be more complete and accurate than using reverse DNS lookups.
-
 GeoLite Country is similar to the GeoIP Country database, but is not
 as accurate. Should you require greater accuracy, GeoIP Country is a
 drop-in replacement for GeoLite Country.
@@ -30,12 +24,6 @@ License disclaimer: this product includes GeoLite data created by
 MaxMind, available from <http://www.maxmind.com/>.
 
 %description -l pl.UTF-8
-GeoIP jest biblioteką napisaną w C umożliwiającą użytkownikowi
-odnalezienie państwa, z którego pochodzi dany adres IP lub domena.
-Używa do tego zapisanej w pliku bazy danych (z marca 2003). W bazie
-tej adresy IP są kluczami, a państwa wartościami. Powinna ona być
-dokładniejsza niż sprawdzanie odwrotnego DNS. 
-
 GeoLite Country jest podobna do bazy danych GeoIP Country, ale nie
 jest tak dokładna. Jeśli wymagana jest większa dokładność, GeoIP
 Country jest zamiennikiem GeoLite Country.
@@ -44,22 +32,31 @@ Informacja licencyjna: ten produkt zawiera dane GeoLite stworzone
 przez MaxWind, dostępne z <http://www.maxwind.com/>.
 
 %prep
-%setup -q -c -T
-cp %{SOURCE0} .
-cp %{SOURCE1} .
-
-gunzip GeoIP.dat.gz
+%setup -qcT
+cp -p %{SOURCE0} .
+cp -p %{SOURCE1} .
+
+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
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/GeoIP
-
-install 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