Update version, adapt dependencies, and correct build configuration.

Wed, 08 Feb 2012 20:16:10 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 08 Feb 2012 20:16:10 +0200
changeset 603
72fb5257eb82
parent 602
6b1bca241155
child 604
87d3ada2f769

Update version, adapt dependencies, and correct build configuration.

geoip/geoip.spec file | annotate | diff | comparison | revisions
     1.1 --- a/geoip/geoip.spec	Wed Feb 08 20:15:50 2012 +0200
     1.2 +++ b/geoip/geoip.spec	Wed Feb 08 20:16:10 2012 +0200
     1.3 @@ -22,8 +22,8 @@
     1.4  ##
     1.5  
     1.6  #   package version
     1.7 -%define       V_api_c   1.4.6
     1.8 -%define       V_api_pl  1.37
     1.9 +%define       V_api_c   1.4.8
    1.10 +%define       V_api_pl  1.40
    1.11  
    1.12  #   package information
    1.13  Name:         geoip
    1.14 @@ -36,7 +36,7 @@
    1.15  Group:        Mapping
    1.16  License:      GPL
    1.17  Version:      %{V_api_c}
    1.18 -Release:      20090408
    1.19 +Release:      20120208
    1.20  
    1.21  #   package options
    1.22  %option       with_perl   no
    1.23 @@ -49,8 +49,14 @@
    1.24  #   build information
    1.25  Prefix:       %{l_prefix}
    1.26  BuildRoot:    %{l_buildroot}
    1.27 -BuildPreReq:  OpenPKG, openpkg >= 20040130, zlib, gcc
    1.28 -PreReq:       OpenPKG, openpkg >= 20040130, zlib
    1.29 +BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc
    1.30 +PreReq:       OpenPKG, openpkg >= 20060823
    1.31 +BuildPreReq:  zlib
    1.32 +PreReq:       zlib
    1.33 +%if "%{with_perl}" == "yes"
    1.34 +BuildPreReq:  perl, perl-openpkg
    1.35 +PreReq:       perl
    1.36 +%endif
    1.37  AutoReq:      no
    1.38  AutoReqProv:  no
    1.39  
    1.40 @@ -97,7 +103,10 @@
    1.41      CPPFLAGS="%{l_cppflags}" \
    1.42      LDFLAGS="%{l_ldflags}" \
    1.43      LIBS="-lz" \
    1.44 -    GREP="grep" \
    1.45 +    AUTOCONF="true" \
    1.46 +    AUTOMAKE="true" \
    1.47 +    AUTOHEADER="true" \
    1.48 +    ACLOCAL="true" \
    1.49      ./configure \
    1.50          --cache-file=./config.cache \
    1.51          --prefix=%{l_prefix} \
    1.52 @@ -118,7 +127,7 @@
    1.53      %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix} \
    1.54          $RPM_BUILD_ROOT%{l_prefix}/man \
    1.55          $RPM_BUILD_ROOT%{l_prefix}/man/man1
    1.56 -    %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
    1.57 +    %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT"
    1.58      %{l_shtool} install -c -m 644 \
    1.59          data/GeoLiteCity.dat $RPM_BUILD_ROOT%{l_prefix}/share/GeoIP
    1.60  %if "%{with_perl}" == "yes"

mercurial