[sr-dev] git:5.2:87759978: pkg/kamailio/obs: Fixed missing libmnl-devel and librabbitmq-devel on RHEL dists

[Henning Westerholt]

Module: kamailio
Branch: 5.2
Commit: 87759978d3997f26fb935a95eed1342ffa079473
URL: https://github.com/kamailio/kamailio/commit/87759978d3997f26fb935a95eed1342ffa079473

Author: Sergey Safarov <s.safarov at gmail.com>
Committer: Henning Westerholt <hw at kamailio.org>
Date: 2018-11-09T10:42:31+01:00

pkg/kamailio/obs: Fixed missing libmnl-devel and librabbitmq-devel on RHEL dists

(cherry picked from commit 68646c6fff4a06fa949296d1a41483ff51fc9389)

---

Modified: pkg/kamailio/obs/kamailio.service
Modified: pkg/kamailio/obs/kamailio.spec

---

Diff:  https://github.com/kamailio/kamailio/commit/87759978d3997f26fb935a95eed1342ffa079473.diff
Patch: https://github.com/kamailio/kamailio/commit/87759978d3997f26fb935a95eed1342ffa079473.patch

---

diff --git a/pkg/kamailio/obs/kamailio.service b/pkg/kamailio/obs/kamailio.service
index 0be0dc0e63..237ad10ef5 100644
--- a/pkg/kamailio/obs/kamailio.service
+++ b/pkg/kamailio/obs/kamailio.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Kamailio (OpenSER) - the Open Source SIP Server
-After=network.target
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 Type=simple
diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec
index 8fc518fb0b..7c9dcc6905 100644
--- a/pkg/kamailio/obs/kamailio.spec
+++ b/pkg/kamailio/obs/kamailio.spec
@@ -9,6 +9,7 @@
 %bcond_with dnssec
 %bcond_without geoip
 %bcond_without http_async_client
+%bcond_without ims
 %bcond_without jansson
 %bcond_without json
 %bcond_without lua
@@ -30,6 +31,7 @@
 %bcond_with dnssec
 %bcond_without geoip
 %bcond_without http_async_client
+%bcond_without ims
 %bcond_without jansson
 %bcond_without json
 %bcond_without lua
@@ -51,6 +53,7 @@
 %bcond_with dnssec
 %bcond_without geoip
 %bcond_without http_async_client
+%bcond_without ims
 %bcond_without jansson
 %bcond_without json
 %bcond_without lua
@@ -72,6 +75,7 @@
 %bcond_without dnssec
 %bcond_without geoip
 %bcond_with http_async_client
+%bcond_without ims
 %bcond_with jansson
 %bcond_with json
 %bcond_without lua
@@ -94,6 +98,7 @@
 %bcond_with dnssec
 %bcond_without geoip
 %bcond_without http_async_client
+%bcond_without ims
 %bcond_without jansson
 %bcond_without json
 %bcond_without lua
@@ -115,6 +120,7 @@
 %bcond_with dnssec
 %bcond_without geoip
 %bcond_without http_async_client
+%bcond_without ims
 %bcond_without jansson
 %bcond_without json
 %bcond_without lua
@@ -136,6 +142,7 @@
 %bcond_without dnssec
 %bcond_with geoip
 %bcond_with http_async_client
+%bcond_with ims
 %bcond_with jansson
 %bcond_with json
 %bcond_with lua
@@ -157,6 +164,7 @@
 %bcond_with dnssec
 %bcond_with geoip
 %bcond_with http_async_client
+%bcond_with ims
 %bcond_with jansson
 %bcond_with json
 %bcond_with lua
@@ -164,7 +172,7 @@
 %bcond_with memcached
 %bcond_without mongodb
 %bcond_without perl
-%bcond_without rabbitmq
+%bcond_with rabbitmq
 %bcond_without redis
 %bcond_with sctp
 %bcond_with websocket
@@ -442,6 +450,7 @@ BuildRequires:  libxml2-devel, libcurl-devel, zlib-devel
 This module implements protocol functions that use the libcurl to communicate with HTTP servers. 
 
 
+%if %{with ims}
 %package    ims
 Summary:    IMS modules and extensions module for Kamailio
 Group:      System Environment/Daemons
@@ -450,6 +459,7 @@ BuildRequires:  libxml2-devel libmnl-devel
 
 %description    ims
 IMS modules and extensions module for Kamailio.
+%endif
 
 
 %if %{with jansson}
@@ -967,7 +977,6 @@ make cfg prefix=/usr \
     basedir=%{buildroot} \
     cfg_prefix=%{buildroot} \
     doc_prefix=%{buildroot} \
-    share_prefix=%{_prefix} \
     doc_dir=%{_docdir}/kamailio/ \
     cfg_target=%{_sysconfdir}/kamailio/ modules_dirs="modules"
 make
@@ -991,7 +1000,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \
 %if %{with http_async_client}
     khttp_async \
 %endif
+%if %{with ims}
     kims \
+%endif
 %if %{with jansson}
     kjansson \
 %endif
@@ -1063,7 +1074,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \
 %if %{with http_async_client}
     khttp_async \
 %endif
+%if %{with ims}
     kims \
+%endif
 %if %{with jansson}
     kjansson \
 %endif
@@ -1602,6 +1615,7 @@ fi
 %doc %{_docdir}/kamailio/modules/README.http_client
 %{_libdir}/kamailio/modules/http_client.so
 
+%if %{with ims}
 %files      ims
 %defattr(-,root,root)
 %{_libdir}/kamailio/libkamailio_ims.so.0
@@ -1638,6 +1652,7 @@ fi
 %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so
 %{_libdir}/kamailio/modules/ims_usrloc_scscf.so
 %{_libdir}/kamailio/modules/smsops.so
+%endif
 
 
 %if %{with jansson}