From f8ebdbcc57b9eb019994da57c00496f12daf6e80 Mon Sep 17 00:00:00 2001 From: Sergey Safarov Date: Sun, 31 May 2015 21:14:04 +0300 Subject: [PATCH 1/3] FS-7553: mod_rad_auth, mod_radius_cdr, mod_format_cdr modules declared, Build dependences declared --- freeswitch.spec | 77 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 72 insertions(+), 5 deletions(-) diff --git a/freeswitch.spec b/freeswitch.spec index 2ce5398046..9a3902830a 100644 --- a/freeswitch.spec +++ b/freeswitch.spec @@ -187,6 +187,19 @@ BuildRequires: net-snmp-devel BuildRequires: libmemcached-devel BuildRequires: portaudio-devel BuildRequires: libsndfile-devel +BuildRequires: mongo-c-driver-devel +BuildRequires: soundtouch-devel => 1.8.0 +BuildRequires: libcodec2-devel +BuildRequires: libsilk-devel +BuildRequires: g722_1-devel +BuildRequires: libvpx-devel => 1.4.0 +BuildRequires: lua-devel +BuildRequires: opus-devel +BuildRequires: flite-devel +BuildRequires: ilbc-devel +BuildRequires: broadvoice-devel +BuildRequires: libyuv-devel >= 0.0.1280 +BuildRequires: flite-devel %if %{build_py26_esl} BuildRequires: python26-devel Requires: python26 @@ -271,6 +284,14 @@ FreeSWITCH development files ###################################################################################################################### # FreeSWITCH Application Modules ###################################################################################################################### +%package application-translate +Summary: FreeSWITCH mod_translate +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description application-translate +Provide an number translation to FreeSWITCH API calls + %package application-abstraction Summary: FreeSWITCH mod_abstraction Group: System/Libraries @@ -500,6 +521,14 @@ Provides FreeSWITCH mod_nibblebill, provides a credit/debit module for FreeSWITCH to allow real-time debiting of credit or cash from a database while calls are in progress. +%package application-rad_auth +Summary: FreeSWITCH mod_rad_auth +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description application-rad_auth +Provides FreeSWITCH mod_rad_auth, authetication via RADIUS protocol from FreeSWITCH dialplan + %package application-redis Summary: FreeSWITCH mod_redis Group: System/Libraries @@ -1007,6 +1036,22 @@ Requires: %{name} = %{version}-%{release} %description event-json-cdr JSON CDR Logger for FreeSWITCH. +%package event-format-cdr +Summary: JSON and XML Logger for the FreeSWITCH open source telephony platform +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description event-format-cdr +JSON and XML Logger for the FreeSWITCH open source telephony platform + +%package event-radius-cdr +Summary: RADIUS Logger for the FreeSWITCH open source telephony platform +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description event-radius-cdr +RADIUS Logger for the FreeSWITCH open source telephony platform + %if %{build_mod_rayo} %package event-rayo Summary: Rayo (XMPP 3PCC) server for the FreeSWITCH open source telephony platform @@ -1344,7 +1389,9 @@ cp %{SOURCE9} libs/ cp %{SOURCE10} libs/ cp %{SOURCE11} libs/ cp %{SOURCE12} libs/ -cp %{SOURCE13} libs/ + +#Hotfix for redefined %_sysconfdir +sed -ie 's:confdir="$sysconfdir/freeswitch":confdir="$sysconfdir":' ./configure.ac ###################################################################################################################### # @@ -1384,11 +1431,12 @@ APPLICATION_MODULES_DE+="applications/mod_esl" APPLICATION_MODULES_FR="applications/mod_fifo applications/mod_fsk applications/mod_fsv applications/mod_hash \ applications/mod_httapi applications/mod_http_cache applications/mod_lcr applications/mod_limit \ - applications/mod_memcache applications/mod_mongo applications/mod_nibblebill applications/mod_redis applications/mod_rss" + applications/mod_memcache applications/mod_mongo applications/mod_nibblebill applications/mod_rad_auth \ + applications/mod_redis applications/mod_rss " APPLICATION_MODULES_SZ="applications/mod_sms applications/mod_snapshot applications/mod_snom applications/mod_soundtouch \ applications/mod_spandsp applications/mod_spy applications/mod_stress \ - applications/mod_valet_parking applications/mod_voicemail \ + applications/mod_valet_parking applications/mod_translate applications/mod_voicemail \ applications/mod_voicemail_ivr" APPLICATIONS_MODULES="$APPLICATION_MODULES_AC $APPLICATION_MODULES_DE $APPLICATION_MODULES_FR $APPLICATION_MODULES_SZ" @@ -1444,8 +1492,8 @@ ENDPOINTS_MODULES="endpoints/mod_dingaling ../../libs/freetdm/mod_freetdm \ # ###################################################################################################################### EVENT_HANDLERS_MODULES="event_handlers/mod_cdr_csv event_handlers/mod_cdr_pg_csv event_handlers/mod_cdr_sqlite \ - event_handlers/mod_cdr_mongodb event_handlers/mod_erlang_event event_handlers/mod_event_multicast \ - event_handlers/mod_event_socket event_handlers/mod_json_cdr \ + event_handlers/mod_cdr_mongodb event_handlers/mod_format_cdr event_handlers/mod_erlang_event event_handlers/mod_event_multicast \ + event_handlers/mod_event_socket event_handlers/mod_json_cdr event_handlers/mod_radius_cdr \ event_handlers/mod_snmp" %if %{build_mod_rayo} EVENT_HANDLERS_MODULES+=" event_handlers/mod_rayo" @@ -1802,6 +1850,7 @@ fi %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/amqp.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/blacklist.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/callcenter.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/conference_layouts.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/cdr_csv.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/cdr_mongodb.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/cdr_pg_csv.conf.xml @@ -1878,6 +1927,12 @@ fi %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/dialplan/public/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/dialplan/skinny-patterns/*.xml ###################################################################################################################### +# Fonts +###################################################################################################################### +%config(noreplace) %attr(0640, freeswitch, daemon) %{_datadir}/freeswitch/fonts/*.ttf +%config(noreplace) %attr(0640, freeswitch, daemon) %{_datadir}/freeswitch/fonts/OFL.txt +%config(noreplace) %attr(0640, freeswitch, daemon) %{_datadir}/freeswitch/fonts/README.fonts +###################################################################################################################### # User Directories ###################################################################################################################### %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/directory/*.xml @@ -1917,6 +1972,9 @@ fi %files application-avmd %{MODINSTDIR}/mod_avmd.so* +%files application-translate +%{MODINSTDIR}/mod_translate.so* + %files application-blacklist %{MODINSTDIR}/mod_blacklist.so* @@ -1991,6 +2049,9 @@ fi %files application-nibblebill %{MODINSTDIR}/mod_nibblebill.so* +%files application-rad_auth +%{MODINSTDIR}/mod_rad_auth.so* + %files application-redis %{MODINSTDIR}/mod_redis.so* @@ -2198,6 +2259,12 @@ fi %files event-json-cdr %{MODINSTDIR}/mod_json_cdr.so* +%files event-format-cdr +%{MODINSTDIR}/mod_format_cdr.so* + +%files event-radius-cdr +%{MODINSTDIR}/mod_radius_cdr.so* + %if %{build_mod_rayo} %files event-rayo %{MODINSTDIR}/mod_rayo.so* From 42171579d2fc1a95e360c3e0d8e5162df7a702a2 Mon Sep 17 00:00:00 2001 From: Sergey Safarov Date: Thu, 4 Jun 2015 08:35:09 -0400 Subject: [PATCH 2/3] FS-7553: New modules declaration has been sorted --- freeswitch.spec | 68 +++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/freeswitch.spec b/freeswitch.spec index 9a3902830a..5551bd2463 100644 --- a/freeswitch.spec +++ b/freeswitch.spec @@ -187,19 +187,18 @@ BuildRequires: net-snmp-devel BuildRequires: libmemcached-devel BuildRequires: portaudio-devel BuildRequires: libsndfile-devel -BuildRequires: mongo-c-driver-devel -BuildRequires: soundtouch-devel => 1.8.0 +BuildRequires: broadvoice-devel +BuildRequires: flite-devel +BuildRequires: ilbc-devel = 0.0.1 +BuildRequires: g722_1-devel BuildRequires: libcodec2-devel BuildRequires: libsilk-devel -BuildRequires: g722_1-devel BuildRequires: libvpx-devel => 1.4.0 -BuildRequires: lua-devel -BuildRequires: opus-devel -BuildRequires: flite-devel -BuildRequires: ilbc-devel -BuildRequires: broadvoice-devel BuildRequires: libyuv-devel >= 0.0.1280 -BuildRequires: flite-devel +BuildRequires: lua-devel +BuildRequires: mongo-c-driver-devel +BuildRequires: opus-devel +BuildRequires: soundtouch-devel => 1.7.1 %if %{build_py26_esl} BuildRequires: python26-devel Requires: python26 @@ -284,14 +283,6 @@ FreeSWITCH development files ###################################################################################################################### # FreeSWITCH Application Modules ###################################################################################################################### -%package application-translate -Summary: FreeSWITCH mod_translate -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description application-translate -Provide an number translation to FreeSWITCH API calls - %package application-abstraction Summary: FreeSWITCH mod_abstraction Group: System/Libraries @@ -604,6 +595,14 @@ Requires: %{name} = %{version}-%{release} Provides FreeSWITCH mod_stress. mod_stress attempts to detect stress in a person's voice and generates FreeSWITCH events based on that data. +%package application-translate +Summary: FreeSWITCH mod_translate +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description application-translate +Provide an number translation to FreeSWITCH API calls + %package application-valet_parking Summary: FreeSWITCH mod_valet_parking Group: System/Libraries @@ -1012,6 +1011,14 @@ BuildRequires: erlang %description event-erlang-event Erlang Event Module for FreeSWITCH. +%package event-format-cdr +Summary: JSON and XML Logger for the FreeSWITCH open source telephony platform +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description event-format-cdr +JSON and XML Logger for the FreeSWITCH open source telephony platform + %package event-multicast Summary: Multicast Event System for the FreeSWITCH open source telephony platform Group: System/Libraries @@ -1036,14 +1043,6 @@ Requires: %{name} = %{version}-%{release} %description event-json-cdr JSON CDR Logger for FreeSWITCH. -%package event-format-cdr -Summary: JSON and XML Logger for the FreeSWITCH open source telephony platform -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description event-format-cdr -JSON and XML Logger for the FreeSWITCH open source telephony platform - %package event-radius-cdr Summary: RADIUS Logger for the FreeSWITCH open source telephony platform Group: System/Libraries @@ -1391,7 +1390,7 @@ cp %{SOURCE11} libs/ cp %{SOURCE12} libs/ #Hotfix for redefined %_sysconfdir -sed -ie 's:confdir="$sysconfdir/freeswitch":confdir="$sysconfdir":' ./configure.ac +sed -ie 's:confdir="${sysconfdir}/freeswitch":confdir="$sysconfdir":' ./configure.ac ###################################################################################################################### # @@ -1850,7 +1849,6 @@ fi %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/amqp.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/blacklist.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/callcenter.conf.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/conference_layouts.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/cdr_csv.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/cdr_mongodb.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/cdr_pg_csv.conf.xml @@ -1858,6 +1856,7 @@ fi %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/cepstral.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/cidlookup.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/conference.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/conference_layouts.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/console.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/db.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/dialplan_directory.conf.xml @@ -1972,9 +1971,6 @@ fi %files application-avmd %{MODINSTDIR}/mod_avmd.so* -%files application-translate -%{MODINSTDIR}/mod_translate.so* - %files application-blacklist %{MODINSTDIR}/mod_blacklist.so* @@ -2076,6 +2072,9 @@ fi %files application-stress %{MODINSTDIR}/mod_stress.so* +%files application-translate +%{MODINSTDIR}/mod_translate.so* + %files application-valet_parking %{MODINSTDIR}/mod_valet_parking.so* @@ -2250,6 +2249,9 @@ fi %files event-erlang-event %{MODINSTDIR}/mod_erlang_event.so* +%files event-format-cdr +%{MODINSTDIR}/mod_format_cdr.so* + %files event-multicast %{MODINSTDIR}/mod_event_multicast.so* @@ -2259,9 +2261,6 @@ fi %files event-json-cdr %{MODINSTDIR}/mod_json_cdr.so* -%files event-format-cdr -%{MODINSTDIR}/mod_format_cdr.so* - %files event-radius-cdr %{MODINSTDIR}/mod_radius_cdr.so* @@ -2464,6 +2463,9 @@ fi # ###################################################################################################################### %changelog +* Thu Jun 04 2015 - crienzo@grasshopper.com +- Build dependences declared +- mod_rad_auth, mod_radius_cdr, mod_format_cdr modules declared * Tue Nov 04 2014 - crienzo@grasshopper.com - add mod_graylog2 and mod_mongo * Thu Sep 11 2014 - krice@freeswitch.org From 4b9d873857a2dbef3f161f9b1ecf6c7f50b198bb Mon Sep 17 00:00:00 2001 From: Sergey Safarov Date: Thu, 4 Jun 2015 08:48:38 -0400 Subject: [PATCH 3/3] FS-7553: Email address is fixed --- freeswitch.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeswitch.spec b/freeswitch.spec index 5551bd2463..5dd9b4fb70 100644 --- a/freeswitch.spec +++ b/freeswitch.spec @@ -2463,7 +2463,7 @@ fi # ###################################################################################################################### %changelog -* Thu Jun 04 2015 - crienzo@grasshopper.com +* Thu Jun 04 2015 - s.safarov@gmail.com - Build dependences declared - mod_rad_auth, mod_radius_cdr, mod_format_cdr modules declared * Tue Nov 04 2014 - crienzo@grasshopper.com