updated to 20181023

[packages/xtables-geoip.git] / xtables-geoip.spec

diff --git a/xtables-geoip.spec b/xtables-geoip.spec
index de8cafcf3c53abb154654c570e34c20ed1dc3e12..bd42789a22b7fcad3ae71ea4ebc1f233a3601bae 100644 (file)
--- a/xtables-geoip.spec
+++ b/xtables-geoip.spec
@@ -23,12 +23,6 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # no debuginfo to package
 %define                _enable_debug_packages  0
 
-%ifarch ppc ppc64 s390 s390x sparc sparc64 sparcv9
-%define                byteorder       BE
-%else
-%define                byteorder       LE
-%endif
-
 %description
 The package contains the GeoIP definition files (which IP addresses
 belong to which country) that are needed for Xtables-addons's xt_geoip
@@ -42,7 +36,8 @@ xtables-addons.
 %prep
 %setup -qc
 
-ver=$(ls -d GeoLite2-Country-CSV_* | head -1 | %{__sed} 's/^GeoLite2-Country-CSV_//')
+ver=$(echo GeoLite2-Country-CSV_*)
+ver=${ver#GeoLite2-Country-CSV_}
 if [ "$ver" != %{version} ]; then
        exit 1
 fi
@@ -50,48 +45,18 @@ fi
 cp -p %{SOURCE1} .
 
 %build
-%{__mkdir} %{byteorder}
-%{__perl} %{SOURCE2} -S GeoLite2-Country-CSV_%{version} -D %{byteorder} > ranges.txt
+%{__mkdir} out
+%{__perl} %{SOURCE2} -S GeoLite2-Country-CSV_%{version} -D out > ranges.txt
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{dbdir}
-cp -a %{byteorder} $RPM_BUILD_ROOT%{dbdir}
-
-%if "%{pld_release}" == "ac"
-# handle older xtables in ac:
-# kernel-net-xtables-addons-1.18-15@2.6.27.53_1.amd64
-# still having old .iv0 names requirement
-# http://xtables-addons.git.sourceforge.net/git/gitweb.cgi?p=xtables-addons/xtables-addons;a=commitdiff;h=25bf680ead80e505d5073308f151b4007cb5683f
-# create hardlink, to be most compatible
-for a in $RPM_BUILD_ROOT%{dbdir}/%{byteorder}/*.iv4; do
-       ln $a ${a%.iv4}.iv0
-done
-# kernel-net-xtables-addons-1.18-8@2.6.27.45_1.i686  searches from /var/lib:
-# Could not open /var/lib/geoip/LE/EE.iv0: No such file or directory
-install -d $RPM_BUILD_ROOT/var/lib
-ln -s %{_datadir}/xt_geoip $RPM_BUILD_ROOT/var/lib/geoip
-%endif
+cp -a out/* $RPM_BUILD_ROOT%{dbdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if "%{pld_release}" == "ac"
-%pretrans
-# this needs to be a symlink
-if [ -d /var/lib/geoip -a ! -L /var/lib/geoip ]; then
-       mv -f /var/lib/geoip{,.rpmsave}
-       install -d %{dbdir}
-       ln -s %{dbdir} /var/lib/geoip
-fi
-%endif
-
 %files
 %defattr(644,root,root,755)
 %doc LICENSE.txt ranges.txt
-%dir %{dbdir}
-%{dbdir}/%{byteorder}
-
-%if "%{pld_release}" == "ac"
-/var/lib/geoip
-%endif
+%{dbdir}