Module: kamailio Branch: master Commit: e7a14f37c98e2bbfcf234165dc5dfd4121db5b5b URL: https://github.com/kamailio/kamailio/commit/e7a14f37c98e2bbfcf234165dc5dfd4… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-14T20:57:07+03:00 pkg/kamailio/obs: simlifid module definition for RHEL dist --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/e7a14f37c98e2bbfcf234165dc5dfd4… Patch: https://github.com/kamailio/kamailio/commit/e7a14f37c98e2bbfcf234165dc5dfd4… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 74912950eb..43ec4feb1a 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -28,9 +28,15 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 6 +%if 0%{?rhel} == 6 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} +%endif +%if 0%{?centos_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_with cnxcc %bcond_without dnssec %bcond_without evapi @@ -54,10 +60,16 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 7 +%if 0%{?rhel} == 7 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} %define dist .el7.centos +%endif +%if 0%{?centos_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi @@ -81,23 +93,26 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 8 || 0%{?almalinux_ver} == 8 || 0%{?rocky_ver} == 8 -%define rhel_rebuild 8 -% if 0%{?centos_ver} +%if 0%{?rhel} == 8 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} %define dist .el8.centos %endif -% if 0%{?almalinux_ver} +%if 0%{?almalinux_ver} %define dist_name centos %define dist_version %{?almalinux} %define dist .el8.almalinux %endif -% if 0%{?rocky_ver} +%if 0%{?rocky_ver} %define dist_name centos %define dist_version %{?rocky} %define dist .el8.rocky %endif +%if 0%{?centos_ver} == 0 && 0%{?almalinux_ver} == 0 && 0%{?rocky_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi @@ -147,84 +162,6 @@ %bcond_without xmlrpc %endif -%if 0%{?rhel} == 6 && 0%{?centos_ver} != 6 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_with cnxcc -%bcond_without dnssec -%bcond_without evapi -%bcond_with geoip -%bcond_with http_async_client -%bcond_with ims -%bcond_with jansson -%bcond_with json -%bcond_with lua -%bcond_with kazoo -%bcond_with memcached -%bcond_with mongodb -%bcond_with perl -%bcond_with phonenum -%bcond_with python3 -%bcond_with rabbitmq -%bcond_with redis -%bcond_with ruby -%bcond_with sctp -%bcond_with websocket -%bcond_without xmlrpc -%endif - -%if 0%{?rhel} == 7 && 0%{?centos_ver} != 7 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without evapi -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?rhel} == 8 && 0%{?rhel_rebuild} != 8 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without evapi -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - # Defining missing macros on RHEL/CentOS 6 %if 0%{?rhel} == 6 %define _rundir %{_localstatedir}/run