[sr-dev] git:master:08836b31: Merge pull request #1494 from sergey-safarov/spec_update

GitHub noreply at github.com
Mon Apr 9 12:16:55 CEST 2018


Module: kamailio
Branch: master
Commit: 08836b3138a64d6fbac292ae68deb6b84f669de1
URL: https://github.com/kamailio/kamailio/commit/08836b3138a64d6fbac292ae68deb6b84f669de1

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: GitHub <noreply at github.com>
Date: 2018-04-09T12:16:48+02:00

Merge pull request #1494 from sergey-safarov/spec_update

RPM spec update

---

Modified: pkg/kamailio/obs/kamailio.spec

---

Diff:  https://github.com/kamailio/kamailio/commit/08836b3138a64d6fbac292ae68deb6b84f669de1.diff
Patch: https://github.com/kamailio/kamailio/commit/08836b3138a64d6fbac292ae68deb6b84f669de1.patch

---

diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec
index 3dabb21985..d7f27371d3 100644
--- a/pkg/kamailio/obs/kamailio.spec
+++ b/pkg/kamailio/obs/kamailio.spec
@@ -179,6 +179,7 @@ Source:     http://kamailio.org/pub/kamailio/%{ver}/src/%{name}-%{ver}_src.tar.g
 URL:        http://kamailio.org/
 Vendor:     kamailio.org
 BuildRoot:  %{_tmppath}/%{name}-%{ver}-buildroot
+Conflicts:  kamailio-acc_json < %ver
 Conflicts:  kamailio-auth-ephemeral < %ver, kamailio-bdb < %ver
 Conflicts:  kamailio-carrierroute < %ver, kamailio-cpl < %ver
 Conflicts:  kamailio-dialplan < %ver, kamailio-dnssec < %ver
@@ -218,6 +219,23 @@ platforms or to scale up SIP-to-PSTN gateways, PBX systems or media servers
 like Asteriskâ„¢, FreeSWITCHâ„¢ or SEMS.
 
 
+%if %{with jansson}
+%package    acc_json
+Summary:    Account transaction information in a JSON dictionary
+Group:      System Environment/Daemons
+%if 0%{?suse_version}
+Requires:   libjansson
+BuildRequires:  libjansson-devel
+%else
+Requires:   jansson
+BuildRequires:  jansson-devel
+%endif
+
+%description    acc_json
+Account transaction information in a JSON dictionary
+%endif
+
+
 %package    auth-ephemeral
 Summary:    Functions for authentication using ephemeral credentials
 Group:      System Environment/Daemons
@@ -257,13 +275,6 @@ Berkeley database connectivity for Kamailio.
 Summary:    The carrierroute module for Kamailio
 Group:      System Environment/Daemons
 Requires:   kamailio = %ver
-%if 0%{?suse_version}
-Requires:   libconfuse0
-BuildRequires:  libconfuse-devel
-%else
-Requires:   libconfuse
-BuildRequires:  libconfuse-devel
-%endif
 
 %description    carrierroute
 The carrierroute module for Kamailio.
@@ -1442,6 +1453,14 @@ fi
 %{_datadir}/kamailio/dbtext/kamailio/*
 
 
+%if %{with jansson}
+%files      acc_json
+%defattr(-,root,root)
+%doc %{_docdir}/kamailio/modules/README.acc_json
+%{_libdir}/kamailio/modules/acc_json.so
+%endif
+
+
 %files      auth-ephemeral
 %defattr(-,root,root)
 %doc %{_docdir}/kamailio/modules/README.auth_ephemeral
@@ -1713,6 +1732,9 @@ fi
 %doc %{_docdir}/kamailio/modules/README.pua
 %doc %{_docdir}/kamailio/modules/README.pua_bla
 %doc %{_docdir}/kamailio/modules/README.pua_dialoginfo
+%if %{with json}
+%doc %{_docdir}/kamailio/modules/README.pua_json
+%endif
 %doc %{_docdir}/kamailio/modules/README.pua_reginfo
 %doc %{_docdir}/kamailio/modules/README.pua_usrloc
 %doc %{_docdir}/kamailio/modules/README.pua_xmpp
@@ -1729,6 +1751,9 @@ fi
 %{_libdir}/kamailio/modules/pua.so
 %{_libdir}/kamailio/modules/pua_bla.so
 %{_libdir}/kamailio/modules/pua_dialoginfo.so
+%if %{with json}
+%{_libdir}/kamailio/modules/pua_json.so
+%endif
 %{_libdir}/kamailio/modules/pua_reginfo.so
 %{_libdir}/kamailio/modules/pua_usrloc.so
 %{_libdir}/kamailio/modules/pua_xmpp.so
@@ -1766,10 +1791,14 @@ fi
 %if %{with redis}
 %files      redis
 %defattr(-,root,root)
+%doc %{_docdir}/kamailio/modules/README.db_redis
 %doc %{_docdir}/kamailio/modules/README.ndb_redis
 %doc %{_docdir}/kamailio/modules/README.topos_redis
+%{_libdir}/kamailio/modules/db_redis.so
 %{_libdir}/kamailio/modules/ndb_redis.so
 %{_libdir}/kamailio/modules/topos_redis.so
+%dir %{_datadir}/kamailio/db_redis
+%{_datadir}/kamailio/db_redis/*
 %endif
 
 




More information about the sr-dev mailing list