pkg/kamailio/(centos|fedora): updated .spec to match latest changes

pkg/kamailio/fedora/17/kamailio.spec

@@ -27,6 +27,7 @@ Conflicts:     kamailio-dialplan < %ver, kamailio-lcr < %ver
 Conflicts:     kamailio-xmlops < %ver, kamailio-cdp < %ver
 Conflicts:     kamailio-websocket < %ver, kamailio-xhttp-pi < %ver
 Conflicts:     kamailio-outbound < %ver, kamailio-ims < %ver
+Conflicts:     kamailio-auth-identity < %ver
 %if 0%{?fedora}
 Conflicts:     kamailio-radius < %ver, kamailio-carrierroute < %ver
 Conflicts:     kamailio-redis < %ver, kamailio-json < %ver 
@@ -153,6 +154,21 @@ BuildRequires: expat-devel
 SIP/XMPP IM gateway for Kamailio.
 
 
+%package  purple
+Summary:  Multi-protocol IM and presence gateway module.
+Group:    System Environment/Daemons
+%if 0%{?fedora}
+Requires: glib, libpurple, libxml2, kamailio = %ver, kamailio-presence = %ver
+BuildRequires: glib-devel, libpurple-devel, libxml2-devel
+%else
+Requires: glib2, libpurple, libxml2, kamailio = %ver, kamailio-presence = %ver
+BuildRequires: glib2-devel, libpurple-devel, libxml2-devel
+%endif
+
+%description purple
+Multi-protocol IM and presence gateway module.
+
+
 %package ldap
 Summary:       LDAP search interface for Kamailio.
 Group:         System Environment/Daemons
@@ -243,6 +259,36 @@ BuildRequires: libxml2-devel
 XML operation functions for Kamailio.
 
 
+%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.
+
+
+%package  ims
+Summary:  IMS modules and extensions module for Kamailio.
+Group:    System Environment/Daemons
+Requires: libxml2, kamailio = %ver, kamailio-cdp = %ver
+BuildRequires: libxml2-devel
+
+%description ims
+IMS modules and extensions module for Kamailio.
+
+
+%package  auth-identity
+Summary:  Functions for secure identification of originators of SIP messages for Kamailio.
+Group:    System Environment/Daemons
+Requires: libcurl, kamailio = %ver
+BuildRequires: libcurl-devel
+
+%description auth-identity
+Functions for secure identification of originators of SIP messages for Kamailio.
+
+
 %package websocket
 Summary:       WebSocket transport for Kamailio.
 Group:         System Environment/Daemons
@@ -274,41 +320,6 @@ RFC 5626, "Managing Client-Initiated Connections in the Session Initiation
 Protocol (SIP)" support for Kamailio.
 
 
-%package  purple
-Summary:  Multi-protocol IM and presence gateway module.
-Group:    System Environment/Daemons
-%if 0%{?fedora}
-Requires: glib, libpurple, libxml2, kamailio = %ver, kamailio-presence = %ver
-BuildRequires: glib-devel, libpurple-devel, libxml2-devel
-%else
-Requires: glib2, libpurple, libxml2, kamailio = %ver, kamailio-presence = %ver
-BuildRequires: glib2-devel, libpurple-devel, libxml2-devel
-%endif
-
-%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.
-
-
-%package  ims
-Summary:  IMS modules and extensions module for Kamailio.
-Group:    System Environment/Daemons
-Requires: libxml2, kamailio = %ver, kamailio-cdp = %ver
-BuildRequires: libxml2-devel
-
-%description ims
-IMS modules and extensions module for Kamailio.
-
-
 %if 0%{?fedora}
 %package radius
 Summary:       Radius AAA API for Kamailio.
@@ -383,21 +394,19 @@ make FLAVOUR=kamailio cfg prefix=/usr cfg_prefix=$RPM_BUILD_ROOT\
 	modules_dirs="modules" SCTP=1 STUN=1
 make
 %if 0%{?fedora}
-make every-module skip_modules="auth_identity db_cassandra iptrtpproxy \
-	db_oracle memcached mi_xmlrpc osp" \
-	group_include="kstandard kmysql kpostgres kcpl kradius kunixodbc \
-	kxml kperl ksnmpstats kxmpp kcarrierroute kberkeley kldap kutils \
-	kpurple ktls kwebsocket kpresence klua kpython kgeoip ksqlite kjson \
-	kredis kmono koutbound kims" \
-	include_modules="cdp mangler print_lib xhttp_pi"
+make every-module skip_modules="db_cassandra iptrtpproxy db_oracle memcached \
+	mi_xmlrpc osp" \
+	group_include="kstandard kmysql kpostgres kcpl kxml kradius kunixodbc \
+	kperl ksnmpstats kxmpp kcarrierroute kberkeley kldap kutils kpurple \
+	ktls kwebsocket kpresence klua kpython kgeoip ksqlite kjson kredis \
+	kmono kims koutbound"
 %else
-make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\
-	db_oracle memcached mi_xmlrpc osp" \
-	group_include="kstandard kmysql kpostgres kcpl kunixodbc \
-	kxml kperl ksnmpstats kxmpp kberkeley kldap kutils \
-	kpurple ktls kwebsocket kpresence klua kpython ksqlite \
-	koutbound kims" \
-	include_modules="cdp mangler print_lib xhttp_pi"
+make every-module skip_modules="db_cassandra iptrtpproxy db_oracle memcached \
+	mi_xmlrpc osp" \
+	group_include="kstandard kmysql kpostgres kcpl kxml kunixodbc \
+	kperl ksnmpstats kxmpp kberkeley kldap kutils kpurple \
+	ktls kwebsocket kpresence klua kpython ksqlite \
+	kims koutbound"
 %endif
 make utils
 
@@ -408,13 +417,12 @@ make utils
 
 make install
 %if 0%{?fedora}
-make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\
-	db_oracle memcached mi_xmlrpc osp" \
-	group_include="kstandard kmysql kpostgres kcpl kradius kunixodbc\
-	kxml kperl ksnmpstats kxmpp kcarrierroute kberkeley kldap kutils\
-	kpurple ktls kwebsocket kpresence klua kpython kgeoip ksqlite kjson\
-	kredis kmono koutbound kims" \
-	include_modules="cdp mangler print_lib xhttp_pi"
+make install-modules-all skip_modules="db_cassandra iptrtpproxy db_oracle \
+	memcached mi_xmlrpc osp" \
+	group_include="kstandard kmysql kpostgres kcpl kxml kradius kunixodbc \
+	kperl ksnmpstats kxmpp kcarrierroute kberkeley kldap kutils kpurple \
+	ktls kwebsocket kpresence klua kpython kgeoip ksqlite kjson kredis \
+	kmono kims koutbound"
 
 mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
 install -m644 pkg/kamailio/fedora/%{?fedora}/kamailio.service \
@@ -424,13 +432,12 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig
 install -m644 pkg/kamailio/fedora/%{?fedora}/kamailio.sysconfig \
 		$RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/kamailio
 %else
-make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\
-	db_oracle memcached mi_xmlrpc osp" \
-	group_include="kstandard kmysql kpostgres kcpl kunixodbc \
-	kxml kperl ksnmpstats kxmpp kberkeley kldap kutils \
-	kpurple ktls kwebsocket kpresence klua kpython ksqlite \
-	koutbound kims" \
-	include_modules="cdp mangler print_lib xhttp_pi"
+make install-modules-all skip_modules="db_cassandra iptrtpproxy db_oracle \
+	memcached mi_xmlrpc osp" \
+	group_include="kstandard kmysql kpostgres kcpl kxml kunixodbc \
+	kperl ksnmpstats kxmpp kberkeley kldap kutils kpurple \
+	ktls kwebsocket kpresence klua kpython ksqlite \
+	kims koutbound"
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
 install -m755 pkg/kamailio/centos/%{?centos}/kamailio.init \
@@ -902,37 +909,37 @@ fi
 
 
 %files perl
-%defattr(-,root,root)
-%doc %{_docdir}/kamailio/modules/README.app_perl
-%doc %{_docdir}/kamailio/modules/README.db_perlvdb
-%{_libdir}/kamailio/modules/app_perl.so
-%{_libdir}/kamailio/modules/db_perlvdb.so
-%dir %{_libdir}/kamailio/perl
-%{_libdir}/kamailio/perl/Kamailio.pm
-%dir %{_libdir}/kamailio/perl/Kamailio
-%{_libdir}/kamailio/perl/Kamailio/Constants.pm
-%{_libdir}/kamailio/perl/Kamailio/Message.pm
-%{_libdir}/kamailio/perl/Kamailio/VDB.pm
-%dir %{_libdir}/kamailio/perl/Kamailio/LDAPUtils
-%{_libdir}/kamailio/perl/Kamailio/LDAPUtils/LDAPConf.pm
-%{_libdir}/kamailio/perl/Kamailio/LDAPUtils/LDAPConnection.pm
-%dir %{_libdir}/kamailio/perl/Kamailio/Utils
-%{_libdir}/kamailio/perl/Kamailio/Utils/Debug.pm
-%{_libdir}/kamailio/perl/Kamailio/Utils/PhoneNumbers.pm
-%dir %{_libdir}/kamailio/perl/Kamailio/VDB
-%{_libdir}/kamailio/perl/Kamailio/VDB/Column.pm
-%{_libdir}/kamailio/perl/Kamailio/VDB/Pair.pm
-%{_libdir}/kamailio/perl/Kamailio/VDB/ReqCond.pm
-%{_libdir}/kamailio/perl/Kamailio/VDB/Result.pm
-%{_libdir}/kamailio/perl/Kamailio/VDB/VTab.pm
-%{_libdir}/kamailio/perl/Kamailio/VDB/Value.pm
-%dir %{_libdir}/kamailio/perl/Kamailio/VDB/Adapter
-%{_libdir}/kamailio/perl/Kamailio/VDB/Adapter/AccountingSIPtrace.pm
-%{_libdir}/kamailio/perl/Kamailio/VDB/Adapter/Alias.pm
-%{_libdir}/kamailio/perl/Kamailio/VDB/Adapter/Auth.pm
-%{_libdir}/kamailio/perl/Kamailio/VDB/Adapter/Describe.pm
-%{_libdir}/kamailio/perl/Kamailio/VDB/Adapter/Speeddial.pm
-%{_libdir}/kamailio/perl/Kamailio/VDB/Adapter/TableVersions.pm
+#%defattr(-,root,root)
+#%doc %{_docdir}/kamailio/modules/README.app_perl
+#%doc %{_docdir}/kamailio/modules/README.db_perlvdb
+#%{_libdir}/kamailio/modules/app_perl.so
+#%{_libdir}/kamailio/modules/db_perlvdb.so
+#%dir %{_libdir}/kamailio/perl
+#%{_libdir}/kamailio/perl/Kamailio.pm
+#%dir %{_libdir}/kamailio/perl/Kamailio
+#%{_libdir}/kamailio/perl/Kamailio/Constants.pm
+#%{_libdir}/kamailio/perl/Kamailio/Message.pm
+#%{_libdir}/kamailio/perl/Kamailio/VDB.pm
+#%dir %{_libdir}/kamailio/perl/Kamailio/LDAPUtils
+#%{_libdir}/kamailio/perl/Kamailio/LDAPUtils/LDAPConf.pm
+#%{_libdir}/kamailio/perl/Kamailio/LDAPUtils/LDAPConnection.pm
+#%dir %{_libdir}/kamailio/perl/Kamailio/Utils
+#%{_libdir}/kamailio/perl/Kamailio/Utils/Debug.pm
+#%{_libdir}/kamailio/perl/Kamailio/Utils/PhoneNumbers.pm
+#%dir %{_libdir}/kamailio/perl/Kamailio/VDB
+#%{_libdir}/kamailio/perl/Kamailio/VDB/Column.pm
+#%{_libdir}/kamailio/perl/Kamailio/VDB/Pair.pm
+#%{_libdir}/kamailio/perl/Kamailio/VDB/ReqCond.pm
+#%{_libdir}/kamailio/perl/Kamailio/VDB/Result.pm
+#%{_libdir}/kamailio/perl/Kamailio/VDB/VTab.pm
+#%{_libdir}/kamailio/perl/Kamailio/VDB/Value.pm
+#%dir %{_libdir}/kamailio/perl/Kamailio/VDB/Adapter
+#%{_libdir}/kamailio/perl/Kamailio/VDB/Adapter/AccountingSIPtrace.pm
+#%{_libdir}/kamailio/perl/Kamailio/VDB/Adapter/Alias.pm
+#%{_libdir}/kamailio/perl/Kamailio/VDB/Adapter/Auth.pm
+#%{_libdir}/kamailio/perl/Kamailio/VDB/Adapter/Describe.pm
+#%{_libdir}/kamailio/perl/Kamailio/VDB/Adapter/Speeddial.pm
+#%{_libdir}/kamailio/perl/Kamailio/VDB/Adapter/TableVersions.pm
 
 
 %files lua
@@ -1004,6 +1011,12 @@ fi
 %{_libdir}/kamailio/modules/ims_usrloc_scscf.so
 
 
+%files auth-identity
+%defattr(-,root,root)
+%doc %{_docdir}/kamailio/modules/README.auth_identity
+%{_libdir}/kamailio/modules/auth_identity.so
+
+
 %files websocket
 %defattr(-,root,root)
 %doc %{_docdir}/kamailio/modules/README.websocket
@@ -1074,6 +1087,11 @@ fi
 %changelog
 * Tue Mar 5 2013 Peter Dunkley <[email protected]>
   - Updated rel to dev0 and ver to 4.1.0
+  - Re-ordered file to make it internally consistent
+  - Updated make commands to match updated module groups
+  - Added auth_identity back in
+  - Temporarily commented out perl related files as perl modules do not appear
+    to be working
 * Sun Jan 20 2013 Peter Dunkley <[email protected]>
   - Updated rel to pre1
   - Moved modules from modules_k/ to modules/