# HG changeset patch # User Michael Schloh von Bennewitz # Date 1328724970 -7200 # Node ID 72fb5257eb824bdaa6f24e6fe20d512ff763f198 # Parent 6b1bca2411559eb69f51e43148ef9aadd1d31173 Update version, adapt dependencies, and correct build configuration. diff -r 6b1bca241155 -r 72fb5257eb82 geoip/geoip.spec --- a/geoip/geoip.spec Wed Feb 08 20:15:50 2012 +0200 +++ b/geoip/geoip.spec Wed Feb 08 20:16:10 2012 +0200 @@ -22,8 +22,8 @@ ## # package version -%define V_api_c 1.4.6 -%define V_api_pl 1.37 +%define V_api_c 1.4.8 +%define V_api_pl 1.40 # package information Name: geoip @@ -36,7 +36,7 @@ Group: Mapping License: GPL Version: %{V_api_c} -Release: 20090408 +Release: 20120208 # package options %option with_perl no @@ -49,8 +49,14 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, zlib, gcc -PreReq: OpenPKG, openpkg >= 20040130, zlib +BuildPreReq: OpenPKG, openpkg >= 20060823, gcc +PreReq: OpenPKG, openpkg >= 20060823 +BuildPreReq: zlib +PreReq: zlib +%if "%{with_perl}" == "yes" +BuildPreReq: perl, perl-openpkg +PreReq: perl +%endif AutoReq: no AutoReqProv: no @@ -97,7 +103,10 @@ CPPFLAGS="%{l_cppflags}" \ LDFLAGS="%{l_ldflags}" \ LIBS="-lz" \ - GREP="grep" \ + AUTOCONF="true" \ + AUTOMAKE="true" \ + AUTOHEADER="true" \ + ACLOCAL="true" \ ./configure \ --cache-file=./config.cache \ --prefix=%{l_prefix} \ @@ -118,7 +127,7 @@ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix} \ $RPM_BUILD_ROOT%{l_prefix}/man \ $RPM_BUILD_ROOT%{l_prefix}/man/man1 - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT + %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT" %{l_shtool} install -c -m 644 \ data/GeoLiteCity.dat $RPM_BUILD_ROOT%{l_prefix}/share/GeoIP %if "%{with_perl}" == "yes"