[sr-dev] git:master:de323d80: Merge pull request #1105 from sergey-safarov/spec_update9

Module: kamailio Branch: master Commit: de323d80a9fc76d5bea625b1a3ad28a30dda0ea4 URL: https://github.com/kamailio/kamailio/commit/de323d80a9fc76d5bea625b1a3ad28a… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: GitHub &lt;noreply(a)github.com&gt; Date: 2017-05-02T14:09:31+02:00 Merge pull request #1105 from sergey-safarov/spec_update9 pkg/kamailio/centos/7: mod kazoo enabled default build --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/de323d80a9fc76d5bea625b1a3ad28a… Patch: https://github.com/kamailio/kamailio/commit/de323d80a9fc76d5bea625b1a3ad28a… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index d6fd642..89d8874 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -2,7 +2,6 @@ %define ver 5.1.0 %define rel dev1%{dist} %bcond_with dnssec -%bcond_with kazoo @@ -23,9 +22,7 @@ Conflicts: kamailio-dialplan < %ver, kamailio-dnssec < %ver Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver -%if %{with kazoo} Conflicts: kamailio-kazoo < %ver -%endif Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver @@ -228,7 +225,6 @@ BuildRequires: json-c-devel, libevent-devel json string handling and RPC modules for Kamailio. -%if %{with kazoo} %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: System Environment/Daemons @@ -237,7 +233,6 @@ BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel %description kazoo Kazoo module for Kamailio. -%endif %package lcr @@ -578,10 +573,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kdnssec \ %endif kgeoip kgzcompress khttp_async kims kjansson kjson kjsonrpcs \ -%if %{with kazoo} - kkazoo \ -%endif - kldap klua kmemcached \ + kkazoo kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -601,10 +593,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kdnssec \ %endif kgeoip kgzcompress khttp_async kims kjansson kjson kjsonrpcs \ -%if %{with kazoo} - kkazoo \ -%endif - kldap klua kmemcached \ + kkazoo kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -1093,12 +1082,10 @@ fi %{_libdir}/kamailio/modules/jsonrpcc.so -%if %{with kazoo} %files kazoo %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.kazoo %{_libdir}/kamailio/modules/kazoo.so -%endif %files lcr