- rel 2; package IPv6 database, too; version tarballs locally

diff --git a/GeoIP-db-Country.spec b/GeoIP-db-Country.spec
index e83dadbd7a33bcaad7076e8d044ab6bb7f15b822..7ceb3b55b6badc9d124eb242979e231ee9bf53ac 100644 (file)
--- a/GeoIP-db-Country.spec
+++ b/GeoIP-db-Country.spec
@@ -3,11 +3,13 @@ Summary(pl.UTF-8):    GeoLite Country - baza danych krajów dla GeoIP
 Name:          GeoIP-db-Country
 # 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/GeoLiteCountry/GeoIP.dat.gz
+Source0:       http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz?/GeoIP-%{version}.dat.gz
 # Source0-md5: a551a8f2044c3e6e364c1aa82fe183b3
+Source1:       http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz?/GeoIPv6-%{version}.dat.gz
+# Source1-md5: c635ff5a0ec3afb83b7c291b17323174
 URL:           http://dev.maxmind.com/geoip/legacy/geolite/
 Requires:      GeoIP-libs >= 1.4.5-2
 BuildArch:     noarch
@@ -32,10 +34,12 @@ przez MaxWind, dostępne z <http://www.maxwind.com/>.
 %prep
 %setup -qcT
 cp -p %{SOURCE0} .
+cp -p %{SOURCE1} .
 
-gunzip GeoIP.dat.gz
+gunzip GeoIP-%{version}.dat.gz
+gunzip GeoIPv6-%{version}.dat.gz
 
-ver=$(TZ=GMT stat -c '%y' GeoIP.dat | awk '{print $1}' | tr - .)
+ver=$(TZ=GMT stat -c '%y' GeoIP-%{version}.dat | awk '{print $1}' | tr - .)
 if [ "$ver" != %{version} ]; then
        exit 1
 fi
@@ -43,7 +47,8 @@ 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