Update version, modernize packaging, and correct nonportable use of u_int types.

Tue, 28 Aug 2012 18:31:40 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Tue, 28 Aug 2012 18:31:40 +0200
changeset 548
efb4f295e1cf
parent 547
1c75a8bb0fec
child 549
00e5f0537340

Update version, modernize packaging, and correct nonportable use of u_int types.

kamailio/kamailio.spec file | annotate | diff | comparison | revisions
     1.1 --- a/kamailio/kamailio.spec	Tue Aug 28 18:31:35 2012 +0200
     1.2 +++ b/kamailio/kamailio.spec	Tue Aug 28 18:31:40 2012 +0200
     1.3 @@ -31,8 +31,8 @@
     1.4  Class:        PLUS
     1.5  Group:        VoIP
     1.6  License:      GPL
     1.7 -Version:      3.2.2
     1.8 -Release:      20120208
     1.9 +Version:      3.3.1
    1.10 +Release:      20120800
    1.11  
    1.12  #   package options
    1.13  %option       with_cons    yes
    1.14 @@ -60,10 +60,8 @@
    1.15  Source3:      fsl.kamailio
    1.16  
    1.17  #   build information
    1.18 -Prefix:       %{l_prefix}
    1.19 -BuildRoot:    %{l_buildroot}
    1.20 -BuildPreReq:  OpenPKG, openpkg >= 20060823
    1.21 -PreReq:       OpenPKG, openpkg >= 20060823
    1.22 +BuildPreReq:  OpenPKG, openpkg >= 20100101
    1.23 +PreReq:       OpenPKG, openpkg >= 20100101
    1.24  BuildPreReq:  libxml, expat, curl, readline
    1.25  PreReq:       libxml, expat, curl, readline
    1.26  BuildPreReq:  make, gcc, flex, bison, sed, pkgconfig
    1.27 @@ -131,8 +129,6 @@
    1.28  BuildPreReq:  python
    1.29  PreReq:       python
    1.30  %endif
    1.31 -AutoReq:      no
    1.32 -AutoReqProv:  no
    1.33  
    1.34  %description
    1.35      Kamailio is (beside Opensips) a successor to OpenSER, which in
    1.36 @@ -230,6 +226,14 @@
    1.37      %{l_shtool} subst \
    1.38          -e 's;\(#include.*\)memcache\.h;\1libmemcached/memcached.h;' \
    1.39          modules_k/memcached/memcached.h
    1.40 +    %{l_shtool} subst \
    1.41 +        -e 's;u_int\([0-9]*\)_t;uint\1_t;g' \
    1.42 +        modules_s/bdb/bdb_api.c \
    1.43 +        modules/db_berkeley/km_bdb_lib.h \
    1.44 +        modules/db_berkeley/km_db_berkeley.c \
    1.45 +        modules/db_berkeley/bdb_lib.h \
    1.46 +        modules/sipcapture/sipcapture.h \
    1.47 +        modules/iptrtpproxy/iptrtpproxy.c \
    1.48  
    1.49  %build
    1.50      #   select modules
    1.51 @@ -338,8 +342,6 @@
    1.52          every-module
    1.53  
    1.54  %install
    1.55 -    rm -rf $RPM_BUILD_ROOT
    1.56 -
    1.57      #   select modules
    1.58      modslist='acc alias_db auth auth_identity avp avpops avp_db benchmark blst call_control cfgutils cfg_db cfg_rpc counters cpl-c ctl db_text db_flatstore db_ops debugger dialog dialplan dispatcher diversion domain domainpolicy drouting eval exec enum fifo gflags group htable imc kex lcr malloc_test mangler matrix maxfwd mi_datagram mi_fifo mi_rpc mediaproxy mqueue msilo mtree nathelper nat_traversal options path pdb pdt peering perl perlvdb permissions pike pipelimit prefix_route presence presence_b2b presence_conference presence_dialoginfo presence_mwi presence_reginfo presence_xml pua pua_bla pua_dialoginfo pua_mi pua_reginfo pua_usrloc pua_xmpp pv qos ratelimit regex registrar rr rls rtimer rtpproxy sanity sdpops seas sipcapture siptrace siputils sl sms speeddial sqlops sst statistics textops textopsx timer tm tmx topoh uac uac_redirect uri uri_db userblacklist usrloc utils xcap xcap_client xcap_server xhttp xlog xmlops xmlrpc xmpp'
    1.59  %if "%{with_ssl}" == "yes"
    1.60 @@ -427,7 +429,6 @@
    1.61  %files -f files
    1.62  
    1.63  %clean
    1.64 -    rm -rf $RPM_BUILD_ROOT
    1.65  
    1.66  %post
    1.67      #   on install, setup database (kamctl db create /pfx/var/kamailio/db)

mercurial