packages: xtables-geoip/xtables-geoip.spec - use geoip_build_db.pl (now inc...

[glen]

Author: glen                         Date: Mon Oct 11 11:56:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use geoip_build_db.pl (now included in xtables-addons sources)
- drop debuginfo package (it's empty)

---- Files affected:
packages/xtables-geoip:
   xtables-geoip.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/xtables-geoip/xtables-geoip.spec
diff -u packages/xtables-geoip/xtables-geoip.spec:1.13 packages/xtables-geoip/xtables-geoip.spec:1.14
--- packages/xtables-geoip/xtables-geoip.spec:1.13	Mon Oct 11 13:42:18 2010
+++ packages/xtables-geoip/xtables-geoip.spec	Mon Oct 11 13:56:07 2010
@@ -6,12 +6,12 @@
 License:	GPL, Open Data License
 Group:		Networking/Admin
 URL:		http://www.maxmind.com/
-Source0:	http://jengelh.medozas.de/files/geoip/geoip_src.tar.bz2
-# Source0-md5:	bbcb1edd6ce2ece229d3e61173c7cadc
-Source1:	http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip
-# Source1-md5:	14d2a5c6845f4e3df46c992ffca209d9
-Source2:	http://geolite.maxmind.com/download/geoip/database/LICENSE.txt
-# Source2-md5:	a1381bd1aa0a0c91dc31b3f1e847cf4a
+Source0:	http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip
+# Source0-md5:	14d2a5c6845f4e3df46c992ffca209d9
+Source1:	http://geolite.maxmind.com/download/geoip/database/LICENSE.txt
+# Source1-md5:	a1381bd1aa0a0c91dc31b3f1e847cf4a
+Source2:	http://xtables-addons.git.sf.net/git/gitweb.cgi?p=xtables-addons/xtables-addons;a=blob_plain;f=geoip/geoip_build_db.pl
+# Source2-md5:	7cd5c1ab1d83a94d84ae918f0805603f
 BuildRequires:	perl-Text-CSV_XS >= 0.69
 BuildRequires:	perl-base
 BuildRequires:	unzip
@@ -19,6 +19,9 @@
 
 %define		dbdir	/usr/share/xt_geoip
 
+# no debuginfo to package
+%define		_enable_debug_packages	0
+
 %ifarch ppc sparc ppc64 sparc64 sparcv9
 %define		byteorder	BE
 %else
@@ -32,23 +35,20 @@
 
 %prep
 %setup -qc
-rm -f GeoIPCountryWhois.csv
-%setup -qD -a1
 
 ver=$(stat -c '%y' GeoIPCountryWhois.csv | awk '{print $1}' | tr -d -)
 if [ "$ver" != %{version} ]; then
 	exit 1
 fi
 
-cp -a %{SOURCE2} .
+cp -a %{SOURCE1} .
 
 %build
 install -d %{byteorder}
-cd %{byteorder}
 %if "%{byteorder}" == "BE"
-%{__perl} ../geoip_csv_iv0.pl -b ../GeoIPCountryWhois.csv | tee ../ranges.txt
+%{__perl} %{SOURCE2} -D %{byteorder} -b ../GeoIPCountryWhois.csv | tee ranges.txt
 %else
-%{__perl} ../geoip_csv_iv0.pl ../GeoIPCountryWhois.csv | tee ../ranges.txt
+%{__perl} %{SOURCE2} -D %{byteorder} GeoIPCountryWhois.csv | tee ranges.txt
 %endif
 
 %install
@@ -71,6 +71,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2010/10/11 11:56:07  glen
+- use geoip_build_db.pl (now included in xtables-addons sources)
+- drop debuginfo package (it's empty)
+
 Revision 1.13  2010/10/11 11:42:18  glen
 - monthly update to 20101002
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-geoip/xtables-geoip.spec?r1=1.13&r2=1.14&f=u