X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=GeoIP-db-City.spec;h=541e134ec0432013c0aee2a11b76925b96f0a350;hb=f7f1696;hp=843aad883eb62bec78593bc6c8731d384a18cd6a;hpb=cd369cd045f272252baa89d7b82bd8f4e7fe246f;p=packages%2FGeoIP-db-City.git

diff --git a/GeoIP-db-City.spec b/GeoIP-db-City.spec
index 843aad8..541e134 100644
--- a/GeoIP-db-City.spec
+++ b/GeoIP-db-City.spec
@@ -2,15 +2,17 @@ Summary:	GeoLite City - City database for GeoIP
 Summary(pl.UTF-8):	GeoLite City - baza danych miast dla GeoIP
 Name:		GeoIP-db-City
 # Updated every month:
-Version:	2010.12.04
+Version:	2017.01.04
 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/GeoLiteCity.dat.gz
-# Source0-md5:	05a5a51695b815d5effe79a7be5cc76f
-Source1:	http://www.maxmind.com/download/geoip/database/LICENSE.txt
-# Source1-md5:	a1381bd1aa0a0c91dc31b3f1e847cf4a
-URL:		http://www.maxmind.com/app/geolitecity
+Source0:	http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.xz?/GeoLiteCity-%{version}.dat.xz
+# Source0-md5:	1f180ea293e66ae853474388e5a13d13
+Source1:	http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz?/GeoLiteCityv6-%{version}.dat.gz
+# Source1-md5:	fa68c66e5ca7938d753e7844f7dfa1eb
+URL:		http://dev.maxmind.com/geoip/legacy/geolite/
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -28,16 +30,32 @@ miejski, szerokość i wysokość geograficzną dla adresów IP z całego
 świata.
 
 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 -q -c -T
-cp -a %{SOURCE0} .
-cp -a %{SOURCE1} .
+%setup -qcT
+cp -p %{SOURCE0} .
+cp -p %{SOURCE1} .
 
-gunzip GeoLiteCity.dat.gz
+xz -d GeoLiteCity-%{version}.dat.xz
+gunzip GeoLiteCityv6-%{version}.dat.gz
 
-ver=$(stat -c '%y' GeoLiteCity.dat | awk '{print $1}' | tr - .)
+%build
+# get file DATE in GMT timezone
+filedate() {
+	TZ=GMT stat -c '%y' "$1" | awk '{print $1}'
+}
+
+# use newest file date as version
+d1=$(filedate GeoLiteCity-%{version}.dat)
+d2=$(filedate GeoLiteCityv6-%{version}.dat)
+if [ "$(echo $d1 | tr -d -)" -gt "$(echo $d2 | tr -d -)" ]; then
+	d=$d1
+else
+	d=$d2
+fi
+
+ver=$(echo $d | tr - .)
 if [ "$ver" != %{version} ]; then
 	exit 1
 fi
@@ -45,14 +63,15 @@ fi
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/GeoIP
-cp -a GeoLiteCity.dat $RPM_BUILD_ROOT%{_datadir}/GeoIP
+cp -p GeoLiteCity-%{version}.dat $RPM_BUILD_ROOT%{_datadir}/GeoIP/GeoLiteCity.dat
 ln -s GeoLiteCity.dat $RPM_BUILD_ROOT%{_datadir}/GeoIP/GeoIPCity.dat
 
+cp -p GeoLiteCityv6-%{version}.dat $RPM_BUILD_ROOT%{_datadir}/GeoIP/GeoLiteCityv6.dat
+ln -s GeoLiteCityv6.dat $RPM_BUILD_ROOT%{_datadir}/GeoIP/GeoIPCityv6.dat
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.txt
-%dir %{_datadir}/GeoIP
 %{_datadir}/GeoIP/*.dat