# HG changeset patch # User Michael Schloh von Bennewitz # Date 1346171500 -7200 # Node ID efb4f295e1cf052a0f8e6b417c8a7dbcfd39f93b # Parent 1c75a8bb0fec9ce87438ba6960cb85139d6b4159 Update version, modernize packaging, and correct nonportable use of u_int types. diff -r 1c75a8bb0fec -r efb4f295e1cf kamailio/kamailio.spec --- a/kamailio/kamailio.spec Tue Aug 28 18:31:35 2012 +0200 +++ b/kamailio/kamailio.spec Tue Aug 28 18:31:40 2012 +0200 @@ -31,8 +31,8 @@ Class: PLUS Group: VoIP License: GPL -Version: 3.2.2 -Release: 20120208 +Version: 3.3.1 +Release: 20120800 # package options %option with_cons yes @@ -60,10 +60,8 @@ Source3: fsl.kamailio # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20060823 -PreReq: OpenPKG, openpkg >= 20060823 +BuildPreReq: OpenPKG, openpkg >= 20100101 +PreReq: OpenPKG, openpkg >= 20100101 BuildPreReq: libxml, expat, curl, readline PreReq: libxml, expat, curl, readline BuildPreReq: make, gcc, flex, bison, sed, pkgconfig @@ -131,8 +129,6 @@ BuildPreReq: python PreReq: python %endif -AutoReq: no -AutoReqProv: no %description Kamailio is (beside Opensips) a successor to OpenSER, which in @@ -230,6 +226,14 @@ %{l_shtool} subst \ -e 's;\(#include.*\)memcache\.h;\1libmemcached/memcached.h;' \ modules_k/memcached/memcached.h + %{l_shtool} subst \ + -e 's;u_int\([0-9]*\)_t;uint\1_t;g' \ + modules_s/bdb/bdb_api.c \ + modules/db_berkeley/km_bdb_lib.h \ + modules/db_berkeley/km_db_berkeley.c \ + modules/db_berkeley/bdb_lib.h \ + modules/sipcapture/sipcapture.h \ + modules/iptrtpproxy/iptrtpproxy.c \ %build # select modules @@ -338,8 +342,6 @@ every-module %install - rm -rf $RPM_BUILD_ROOT - # select modules 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' %if "%{with_ssl}" == "yes" @@ -427,7 +429,6 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT %post # on install, setup database (kamctl db create /pfx/var/kamailio/db)