- rel 2; add IPv6 database, too; version tarbals locally

diff --git a/GeoIP-db-City.spec b/GeoIP-db-City.spec
index 93f5b676b5fb406957d001274404e962581f481f..e5eb7f0cb453423eed928c115c143ca1b5db768c 100644 (file)
--- a/GeoIP-db-City.spec
+++ b/GeoIP-db-City.spec
@@ -3,11 +3,13 @@ Summary(pl.UTF-8):    GeoLite City - baza danych miast dla GeoIP
 Name:          GeoIP-db-City
 # Updated every month:
 Version:       2014.02.05
-Release:       1
+Release:       2
 License:       CC 3.0 BY-SA
 Group:         Applications/Databases
-Source0:       http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.xz
+Source0:       http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.xz?/GeoLiteCity-%{version}.dat.xz
 # Source0-md5: 354d8ce598706612f8e134a028fd020a
+Source1:       http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz?/GeoLiteCityv6-%{version}.dat.gz
+# Source1-md5: 61dfc4c65e6433a2402b25e43347594e
 URL:           http://dev.maxmind.com/geoip/legacy/geolite/
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
@@ -33,10 +35,12 @@ przez MaxWind, dostępne z <http://www.maxwind.com/>.
 %prep
 %setup -qcT
 cp -p %{SOURCE0} .
+cp -p %{SOURCE1} .
 
-xz -d GeoLiteCity.dat.xz
+xz -d GeoLiteCity-%{version}.dat.xz
+gunzip GeoLiteCityv6-%{version}.dat.gz
 
-ver=$(TZ=GMT stat -c '%y' GeoLiteCity.dat | awk '{print $1}' | tr - .)
+ver=$(TZ=GMT stat -c '%y' GeoLiteCity-%{version}.dat | awk '{print $1}' | tr - .)
 if [ "$ver" != %{version} ]; then
        exit 1
 fi
@@ -44,9 +48,12 @@ fi
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/GeoIP
-cp -p 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