[sr-dev] git:5.1:997ed8ad: Merge pull request #1638 from sergey-safarov/spec_update2

Module: kamailio Branch: 5.1 Commit: 997ed8adc9a058563e6763959864dc7c11b975d5 URL: https://github.com/kamailio/kamailio/commit/997ed8adc9a058563e6763959864dc7… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: GitHub &lt;noreply(a)github.com&gt; Date: 2018-09-08T08:53:07+02:00 Merge pull request #1638 from sergey-safarov/spec_update2 [5.1] pkg/kamailio/obs: RPM SPEC update --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/997ed8adc9a058563e6763959864dc7… Patch: https://github.com/kamailio/kamailio/commit/997ed8adc9a058563e6763959864dc7… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ba6512632a..a04b269101 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -62,6 +62,46 @@ %bcond_without xmlrpc %endif +%if 0%{?fedora} == 28 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without perl +%bcond_without rabbitmq +%bcond_without redis +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + +%if 0%{?fedora} == 29 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without perl +%bcond_without rabbitmq +%bcond_without redis +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + %if 0%{?centos_ver} == 6 %define dist_name centos %define dist_version %{?centos} @@ -191,7 +231,7 @@ Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver Conflicts: kamailio-python < %ver -Conflicts: kamailio-radius < % ver, kamailio-redis < %ver +Conflicts: kamailio-radius < %ver, kamailio-redis < %ver Conflicts: kamailio-regex < %ver, kamailio-sctp < %ver Conflicts: kamailio-sipdump < %ver Conflicts: kamailio-snmpstats < %ver, kamailio-sqlang < %ver, kamailio-sqlite < %ver @@ -416,7 +456,7 @@ This module implements protocol functions that use the libcurl to communicate wi Summary: IMS modules and extensions module for Kamailio Group: System Environment/Daemons Requires: libxml2, kamailio = %ver -BuildRequires: libxml2-devel +BuildRequires: libxml2-devel libmnl-devel %description ims IMS modules and extensions module for Kamailio. @@ -613,7 +653,7 @@ SIP Presence (and RLS, XCAP, etc) support for Kamailio. Summary: Python extensions for Kamailio Group: System Environment/Daemons Requires: python, kamailio = %ver -BuildRequires: python-devel +BuildRequires: python, python-devel %description python Python extensions for Kamailio. @@ -862,8 +902,6 @@ XML operation functions for Kamailio. %package xmlrpc Summary: XMLRPC transport and encoding for Kamailio RPCs and MI commands Group: System Environment/Daemons -#Requires: libxml2, xmlrpc-c, kamailio = %ver -#BuildRequires: libxml2-devel, xmlrpc-c-devel Requires: libxml2, kamailio = %ver BuildRequires: libxml2-devel @@ -909,13 +947,15 @@ UUID module for Kamailio. ln -s ../obs pkg/kamailio/fedora/24 ln -s ../obs pkg/kamailio/fedora/25 ln -s ../obs pkg/kamailio/fedora/26 +ln -s ../obs pkg/kamailio/fedora/27 +ln -s ../obs pkg/kamailio/fedora/28 +ln -s ../obs pkg/kamailio/fedora/29 mkdir -p pkg/kamailio/rhel ln -s ../obs pkg/kamailio/rhel/6 ln -s ../obs pkg/kamailio/rhel/7 mkdir -p pkg/kamailio/opensuse ln -s ../obs pkg/kamailio/opensuse/1315 ln -s ../obs pkg/kamailio/opensuse/1330 -rm -Rf pkg/kamailio/centos mkdir -p pkg/kamailio/centos ln -s ../obs pkg/kamailio/centos/6 ln -s ../obs pkg/kamailio/centos/7