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

@@ -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

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

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

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

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 <[email protected]>
+  - Added kamailio-cdp RPM for cdp and cdp_avp modules
 * Sat Jun 30 2012 Peter Dunkley <[email protected]>
   - Updated rel to dev1
   - Removed %_sharedir and replaced with standard macro %_datadir

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

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