[opensips] Enable a bunch of previously disabled modules

[Peter Lemenkov]

commit 56e45397c4e367112cabf1f7d7a65d9c3ec61cbb
Author: Fedora Build <lemenkov at gmail.com>
Date:   Sat Aug 18 17:34:40 2012 +0400

    Enable a bunch of previously disabled modules
    
    Signed-off-by: Fedora Build <lemenkov at gmail.com>

 opensips.spec |   47 ++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 38 insertions(+), 9 deletions(-)
---
diff --git a/opensips.spec b/opensips.spec
index 4f66cf2..513098f 100644
--- a/opensips.spec
+++ b/opensips.spec
@@ -13,12 +13,12 @@
 %endif
 %endif
 
-%global EXCLUDE_MODULES mi_xmlrpc osp json cachedb_cassandra %{?disable_snmpstats} %{!?_with_oracle:db_oracle} %{?rhel:cachedb_memcached} %{?rhel:cachedb_redis} lua
+%global EXCLUDE_MODULES osp cachedb_cassandra %{?disable_snmpstats} %{!?_with_oracle:db_oracle} %{?el5:cachedb_redis} lua
 
 Summary:  Open Source SIP Server
 Name:     opensips
 Version:  1.8.1
-Release:  1%{?dist}
+Release:  2%{?dist}
 License:  GPLv2+
 Group:    System Environment/Daemons
 Source0:  http://opensips.org/pub/%{name}/%{version}/src/%{name}-%{version}_src.tar.gz
@@ -47,7 +47,7 @@ BuildRequires:  net-snmp-devel
 BuildRequires:  unixODBC-devel
 BuildRequires:  openssl-devel
 BuildRequires:  expat-devel
-#BuildRequires: xmlrpc-c-devel
+BuildRequires:  xmlrpc-c-devel
 BuildRequires:  libconfuse-devel
 %if 0%{?rhel}
 BuildRequires:  db4-devel
@@ -65,6 +65,7 @@ BuildRequires:  systemd-units
 BuildRequires:  libxslt
 BuildRequires:  lynx
 BuildRequires:  ncurses-devel
+BuildRequireS:  json-c-devel
 
 #Initscripts
 %if 0%{?fedora} > 16
@@ -223,6 +224,15 @@ Requires: %{name} = %{version}-%{release}
 %description  jabber
 Jabber module that integrates XODE XML parser for parsing Jabber messages.
 
+%package  json
+Summary:  A JSON variables within the script
+Group:    System Environment/Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description  json
+This module introduces a new type of variable that provides both serialization and
+de-serialization from JSON format.
+
 %package  ldap
 Summary:  LDAP connector
 Group:    System Environment/Daemons
@@ -243,7 +253,6 @@ The LDAP module implements an LDAP search interface for OpenSIPS.
 #the features implemented in the modules. With this Lua module, you can
 #easily implement your own OpenSIPS extensions in Lua.
 
-%if %{undefined rhel}
 %package  memcached
 Summary:  Memcached connector
 Group:    System Environment/Daemons
@@ -253,7 +262,6 @@ BuildRequires:  libmemcached-devel
 %description  memcached
 Memcached module is an implementation of a cache system designed to
 work with a memcached server.
-%endif
 
 %package  mmgeoip
 Summary:  Wrapper for the MaxMind GeoIP API
@@ -490,7 +498,7 @@ Requires: %{name} = %{version}-%{release}
 %description  python
 Helps implement your own OpenSIPS extensions in Python
 
-%if %{undefined rhel}
+%if %{undefined el5}
 %package  redis
 Summary:  Redis connector
 Group:    System Environment/Daemons
@@ -594,6 +602,15 @@ It fetches XCAP elements, either documents or part of them, by sending HTTP
 GET requests. It also offers support for conditional queries. It uses libcurl
 library as a client-side HTTP transfer library.
 
+%package  xmlrpc
+Summary:  A xmlrpc server
+Group:    System Environment/Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description  xmlrpc
+This module implements a xmlrpc server that handles xmlrpc requests and generates
+xmlrpc responses. When a xmlrpc message is received a default method is executed.
+
 %package  xmpp
 Summary:  Gateway between OpenSIPS and a jabber server
 Group:    System Environment/Daemons
@@ -992,6 +1009,10 @@ chown -R %{opensips_user}:%{opensips_group} %{_sysconfdir}/%{name}
 %{_libdir}/opensips/modules/jabber.so
 %doc docdir/README.jabber
 
+%files json
+%{_libdir}/opensips/modules/json.so
+%doc docdir/README.json
+
 %files ldap
 %{_libdir}/opensips/modules/ldap.so
 %doc docdir/README.ldap
@@ -1001,11 +1022,9 @@ chown -R %{opensips_user}:%{opensips_group} %{_sysconfdir}/%{name}
 #%{_libdir}/opensips/modules/lua.so
 #%doc docdir/README.lua
 
-%if %{undefined rhel}
 %files memcached
 %{_libdir}/opensips/modules/cachedb_memcached.so
 %doc docdir/README.cachedb_memcached
-%endif
 
 %files mmgeoip
 %{_libdir}/opensips/modules/mmgeoip.so
@@ -1126,7 +1145,7 @@ chown -R %{opensips_user}:%{opensips_group} %{_sysconfdir}/%{name}
 %files python
 %{_libdir}/opensips/modules/python.so
 
-%if %{undefined rhel}
+%if %{undefined el5}
 %files redis
 %{_libdir}/opensips/modules/cachedb_redis.so
 %doc docdir/README.cachedb_redis
@@ -1173,11 +1192,21 @@ chown -R %{opensips_user}:%{opensips_group} %{_sysconfdir}/%{name}
 %{_libdir}/opensips/modules/xcap_client.so
 %doc docdir/README.xcap_client
 
+%files xmlrpc
+%{_libdir}/opensips/modules/mi_xmlrpc.so
+%doc docdir/README.mi_xmlrpc
+
 %files xmpp
 %{_libdir}/opensips/modules/xmpp.so
 %doc docdir/README.xmpp
 
 %changelog
+* Fri Aug 17 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.8.1-2
+- Enabled json module
+- Enabled mi_xmlrpc module
+- Enabled cachedb_memcached module on EL5, EL6
+- Enabled cachedb_redis module on EL6
+
 * Wed Aug 15 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.8.1-1
 - Ver. 1.8.1
 - Dropped all upstreamed patches