Module: sip-router Branch: master Commit: 2b392e46054bfe5f6ab475a53ba3212d548f2c7f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b392e4… Author: Peter Dunkley &lt;peter.dunkley(a)crocodile-rcs.com&gt; Committer: Peter Dunkley &lt;peter.dunkley(a)crocodile-rcs.com&gt; Date: Thu Jul 5 20:41:36 2012 +0100 pkg/kamailio/(centos|fedora): Updated .spec and .appl files to build RPM for cdp and cdp_avp modules --- pkg/kamailio/centos/6/kamailio-build.appl | 2 +- pkg/kamailio/centos/6/kamailio.appl | 2 +- pkg/kamailio/fedora/16/kamailio-build.appl | 2 +- pkg/kamailio/fedora/16/kamailio.appl | 2 +- pkg/kamailio/fedora/16/kamailio.spec | 31 +++++++++++++++++++++++---- pkg/kamailio/fedora/17/kamailio-build.appl | 2 +- pkg/kamailio/fedora/17/kamailio.appl | 2 +- 7 files changed, 32 insertions(+), 11 deletions(-) diff --git a/pkg/kamailio/centos/6/kamailio-build.appl b/pkg/kamailio/centos/6/kamailio-build.appl index b9924bd..d3b9a0f 100644 --- a/pkg/kamailio/centos/6/kamailio-build.appl +++ b/pkg/kamailio/centos/6/kamailio-build.appl @@ -21,7 +21,7 @@ packages: - libcurl-devel # kamailio-utils, kamailio-presence - libevent-devel # kamailio-json - libpurple-devel # kamailio-purple - - libxml2-devel # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops + - libxml2-devel # kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xmlops, kamailio-xmlrpc - lua-devel # kamailio-lua - make # kamailio - mod_perl-devel # kamailio-perl diff --git a/pkg/kamailio/centos/6/kamailio.appl b/pkg/kamailio/centos/6/kamailio.appl index 2e6980d..adafc0c 100644 --- a/pkg/kamailio/centos/6/kamailio.appl +++ b/pkg/kamailio/centos/6/kamailio.appl @@ -17,7 +17,7 @@ packages: - libcurl # kamailio-utils, kamailio-presence - libevent # kamailio-json - libpurple # kamailio-purple - - libxml2 # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops + - libxml2 # kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xmlops, kamailio-xmlrpc - mod_perl # kamailio-perl - mysql-libs # kamailio-mysql - net-snmp-libs # kamailio-snmpstats diff --git a/pkg/kamailio/fedora/16/kamailio-build.appl b/pkg/kamailio/fedora/16/kamailio-build.appl index 00390c1..7f3aa58 100644 --- a/pkg/kamailio/fedora/16/kamailio-build.appl +++ b/pkg/kamailio/fedora/16/kamailio-build.appl @@ -25,7 +25,7 @@ packages: - libcurl-devel # kamailio-utils, kamailio-presence - libevent-devel # kamailio-json - libpurple-devel # kamailio-purple - - libxml2-devel # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops + - libxml2-devel # kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xmlops, kamailio-xmlrpc - lua-devel # kamailio-lua - make # kamailio - mod_perl-devel # kamailio-perl diff --git a/pkg/kamailio/fedora/16/kamailio.appl b/pkg/kamailio/fedora/16/kamailio.appl index f65ecd2..f91c8fe 100644 --- a/pkg/kamailio/fedora/16/kamailio.appl +++ b/pkg/kamailio/fedora/16/kamailio.appl @@ -21,7 +21,7 @@ packages: - libcurl # kamailio-utils, kamailio-presence - libevent # kamailio-json - libpurple # kamailio-purple - - libxml2 # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops + - libxml2 # kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xmlops, kamailio-xmlrpc - mod_perl # kamailio-perl - mono-core # kamailio-mono - mysql-libs # kamailio-mysql diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index 47f7234..f01dde9 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -24,7 +24,7 @@ Conflicts: kamailio-tls < %ver, kamailio-purple < %ver, kamailio-ldap < %ver Conflicts: kamailio-xmlrpc < %ver, kamailio-perl < %ver, kamailio-lua < %ver Conflicts: kamailio-python < %ver, kamailio-regex < %ver Conflicts: kamailio-dialplan < %ver, kamailio-lcr < %ver -Conflicts: kamailio-xmlops < %ver +Conflicts: kamailio-xmlops < %ver, kamailio-cdp < %ver %if 0%{?fedora} Conflicts: kamailio-radius < %ver, kamailio-carrierroute < %ver Conflicts: kamailio-redis < %ver, kamailio-json < %ver @@ -263,6 +263,17 @@ BuildRequires: glib2-devel, libpurple-devel, libxml2-devel %description purple Multi-protocol IM and presence gateway module. + +%package cdp +Summary: C Diameter Peer module and extensions module for Kamailio. +Group: System Environment/Daemons +Requires: libxml2, kamailio = %ver +BuildRequires: libxml2-devel + +%description cdp +C Diameter Peer module and extensions module for Kamailio. + + %if 0%{?fedora} %package radius Summary: Radius AAA API for Kamailio. @@ -342,14 +353,14 @@ make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kcarrierroute kpresence kradius kgeoip kregex kdialplan\ klcr ksqlite kredis kjson kmono kberkeley" include_modules="xmlrpc\ - xmlops" + xmlops cdp cdp_avp" %else make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\ db_oracle memcached mi_xmlrpc osp" group_include="kstandard kmysql\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kpresence kregex kdialplan\ klcr ksqlite kberkeley" include_modules="xmlrpc\ - xmlops" + xmlopsi cdp cdp_avp" %endif @@ -364,7 +375,7 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kcarrierroute kpresence kradius kgeoip kregex kdialplan\ klcr ksqlite kredis kjson kmono kberkeley" include_modules="xmlrpc\ - xmlops" + xmlops cdp cdp_avp" mkdir -p $RPM_BUILD_ROOT/%{_unitdir} install -m644 pkg/kamailio/fedora/%{?fedora}/kamailio.service \ @@ -379,7 +390,7 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kpresence kregex kdialplan\ klcr ksqlite kberkeley" include_modules="xmlrpc\ - xmlops" + xmlops cdp cdp_avp" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d install -m755 pkg/kamailio/centos/%{?centos}/kamailio.init \ @@ -892,6 +903,14 @@ fi %{_libdir}/kamailio/modules/xmlops.so +%files cdp +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.cdp +%{_libdir}/kamailio/modules/cdp.so +%doc %{_docdir}/kamailio/modules/README.cdp_avp +%{_libdir}/kamailio/modules/cdp_avp.so + + %if 0%{?fedora} %files radius %defattr(-,root,root) @@ -940,6 +959,8 @@ fi %changelog +* Thu Jul 5 2012 Peter Dunkley &lt;peter(a)dunkley.me.uk&gt; + - Added kamailio-cdp RPM for cdp and cdp_avp modules * Sat Jun 30 2012 Peter Dunkley &lt;peter(a)dunkley.me.uk&gt; - Updated rel to dev1 - Removed %_sharedir and replaced with standard macro %_datadir diff --git a/pkg/kamailio/fedora/17/kamailio-build.appl b/pkg/kamailio/fedora/17/kamailio-build.appl index 3c0f7d6..83a5559 100644 --- a/pkg/kamailio/fedora/17/kamailio-build.appl +++ b/pkg/kamailio/fedora/17/kamailio-build.appl @@ -25,7 +25,7 @@ packages: - libcurl-devel # kamailio-utils, kamailio-presence - libevent-devel # kamailio-json - libpurple-devel # kamailio-purple - - libxml2-devel # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops + - libxml2-devel # kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xmlops, kamailio-xmlrpc - lua-devel # kamailio-lua - make # kamailio - mod_perl-devel # kamailio-perl diff --git a/pkg/kamailio/fedora/17/kamailio.appl b/pkg/kamailio/fedora/17/kamailio.appl index e71964a..7f72806 100644 --- a/pkg/kamailio/fedora/17/kamailio.appl +++ b/pkg/kamailio/fedora/17/kamailio.appl @@ -21,7 +21,7 @@ packages: - libcurl # kamailio-utils, kamailio-presence - libevent # kamailio-json - libpurple # kamailio-purple - - libxml2 # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops + - libxml2 # kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xmlops, kamailio-xmlrpc - mod_perl # kamailio-perl - mono-core # kamailio-mono - mysql-libs # kamailio-mysql