From 9c589b7750f277a52e82c7c773cd093af40c4e6a Mon Sep 17 00:00:00 2001 From: sergey-safarov Date: Fri, 19 Mar 2021 00:30:08 +0300 Subject: [PATCH] [Build-System] freeswitch.spec update * freeswitch.spec: mod_shout - build always enabled * Removed not nessary erlang spec file * freeswitch.spec: Added cache direcory to http_cache module * freeswitch.spec: added zrtp feature in packaging * freeswitch.spec: added dependency for gumbo-parser-devel on fedora dist (HTML parser for MSRP) * remove autoload_configs dir dublication --- erlang.spec | 297 ------------------------------------------------ freeswitch.spec | 21 ++-- 2 files changed, 7 insertions(+), 311 deletions(-) delete mode 100644 erlang.spec diff --git a/erlang.spec b/erlang.spec deleted file mode 100644 index 6cdd7245b9..0000000000 --- a/erlang.spec +++ /dev/null @@ -1,297 +0,0 @@ -%define ver %{VERSION_NUMBER} -%define rel %{RELEASE_NUMBER} - -Name: erlang -Version: %{ver} -Release: %{rel}.1%{?dist} -Summary: General-purpose programming language and runtime environment - -Group: Development/Languages -License: ERPL -URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R14B03.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R14B03.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R14B03.tar.gz -Patch1: otp-R14B-00-0001-Do-not-format-man-pages.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: ncurses-devel -BuildRequires: openssl-devel -BuildRequires: unixODBC-devel -BuildRequires: tcl-devel -BuildRequires: tk-devel -BuildRequires: gd-devel -# BuildRequires: jdk -BuildRequires: flex -BuildRequires: m4 - -Requires: tk - -# Added virtual Provides for each erlang module -Provides: erlang-appmon = %{version}-%{release} -Provides: erlang-asn1 = %{version}-%{release} -Provides: erlang-common_test = %{version}-%{release} -Provides: erlang-compiler = %{version}-%{release} -Provides: erlang-cosEvent = %{version}-%{release} -Provides: erlang-cosEventDomain = %{version}-%{release} -Provides: erlang-cosFileTransfer = %{version}-%{release} -Provides: erlang-cosNotification = %{version}-%{release} -Provides: erlang-cosProperty = %{version}-%{release} -Provides: erlang-cosTime = %{version}-%{release} -Provides: erlang-cosTransactions = %{version}-%{release} -Provides: erlang-crypto = %{version}-%{release} -Provides: erlang-debugger = %{version}-%{release} -Provides: erlang-dialyzer = %{version}-%{release} -Provides: erlang-docbuilder = %{version}-%{release} -Provides: erlang-edoc = %{version}-%{release} -Provides: erlang-erts = %{version}-%{release} -Provides: erlang-et = %{version}-%{release} -Provides: erlang-eunit = %{version}-%{release} -Provides: erlang-gs = %{version}-%{release} -Provides: erlang-hipe = %{version}-%{release} -Provides: erlang-ic = %{version}-%{release} -Provides: erlang-inets = %{version}-%{release} -Provides: erlang-inviso = %{version}-%{release} -Provides: erlang-kernel = %{version}-%{release} -Provides: erlang-megaco = %{version}-%{release} -Provides: erlang-mnesia = %{version}-%{release} -Provides: erlang-observer = %{version}-%{release} -Provides: erlang-odbc = %{version}-%{release} -Provides: erlang-orber = %{version}-%{release} -Provides: erlang-os_mon = %{version}-%{release} -Provides: erlang-otp_mibs = %{version}-%{release} -Provides: erlang-parsetools = %{version}-%{release} -Provides: erlang-percept = %{version}-%{release} -Provides: erlang-pman = %{version}-%{release} -Provides: erlang-public_key = %{version}-%{release} -Provides: erlang-runtime_tools = %{version}-%{release} -Provides: erlang-sasl = %{version}-%{release} -Provides: erlang-snmp = %{version}-%{release} -Provides: erlang-ssh = %{version}-%{release} -Provides: erlang-ssl = %{version}-%{release} -Provides: erlang-stdlib = %{version}-%{release} -Provides: erlang-syntax_tools = %{version}-%{release} -Provides: erlang-test_server = %{version}-%{release} -Provides: erlang-toolbar = %{version}-%{release} -Provides: erlang-tools = %{version}-%{release} -Provides: erlang-tv = %{version}-%{release} -Provides: erlang-typer = %{version}-%{release} -Provides: erlang-webtool = %{version}-%{release} -Provides: erlang-xmerl = %{version}-%{release} - -%description -Erlang is a general-purpose programming language and runtime -environment. Erlang has built-in support for concurrency, distribution -and fault tolerance. Erlang is used in several large telecommunication -systems from Ericsson. - - -%package doc -Summary: Erlang documentation -Group: Development/Languages - -%description doc -Documentation for Erlang. - - -%prep -%setup -q -n otp_src_%{ver}%{rel} -#%setup -q -n otp_src_%{ver} - -%build -# WARN: --enable-dynamic-ssl-lib needed for preventing strange messages about missing dependencies on EPEL -# see https://bugzilla.redhat.com/458646 and https://bugzilla.redhat.com/499525 -%ifarch sparcv9 sparc64 -CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-dynamic-ssl-lib -%else -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-dynamic-ssl-lib -%endif -chmod -R u+w . -make - - -%install -rm -rf $RPM_BUILD_ROOT -make INSTALL_PREFIX=$RPM_BUILD_ROOT install - -# clean up -find $RPM_BUILD_ROOT%{_libdir}/erlang -perm 0775 | xargs chmod 755 -find $RPM_BUILD_ROOT%{_libdir}/erlang -name Makefile | xargs chmod 644 -find $RPM_BUILD_ROOT%{_libdir}/erlang -name \*.o | xargs chmod 644 -find $RPM_BUILD_ROOT%{_libdir}/erlang -name \*.bat | xargs rm -f -find $RPM_BUILD_ROOT%{_libdir}/erlang -name index.txt.old | xargs rm -f - -# doc -mkdir -p erlang_doc -tar -C erlang_doc -zxf %{SOURCE1} -tar -C $RPM_BUILD_ROOT/%{_libdir}/erlang -zxf %{SOURCE2} - -# make links to binaries -#mkdir -p $RPM_BUILD_ROOT/%{_bindir} -#cd $RPM_BUILD_ROOT/%{_bindir} -#for file in erl erlc escript dialyzer -#do -# ln -sf ../%{_lib}/erlang/bin/$file . -#done - -# remove buildroot from installed files -cd $RPM_BUILD_ROOT/%{_libdir}/erlang -sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,start} - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root) -%doc AUTHORS EPLICENCE README.md -%{_bindir}/* -%{_libdir}/erlang - - -%files doc -%defattr(-,root,root) -%doc erlang_doc/* - - -%post -%{_libdir}/erlang/Install -minimal %{_libdir}/erlang >/dev/null 2>/dev/null - - -%changelog -* Wed Sep 29 2010 Anthony Molinaro - R14B-00.1 -- modified R13B04 spec to work with R14B - -* Wed Jul 7 2010 Anthony Molinaro - R13B-04.1 -- modified the R12B spec to work with R13B04 - -* Mon Jun 7 2010 Peter Lemenkov - R12B-5.10 -- Added missing virtual provides erlang-erts - -* Tue May 25 2010 Peter Lemenkov - R12B-5.9 -- Use java-1.4.2 only for EL-[45] -- Added virtual provides for each erlang module -- Small typo fix - -* Mon Apr 19 2010 Peter Lemenkov - R12B-5.8 -- Patches rebased -- Added patches 6,7 from trunk -- Use %%configure - -* Tue Apr 21 2009 Debarshi Ray R12B-5.7 -- Updated rpath patch. -- Fixed configure to respect $RPM_OPT_FLAGS. - -* Sun Mar 1 2009 Gerard Milmeister - R12B-5.6 -- new release R12B-5 -- link escript and dialyzer to %{_bindir} - -* Tue Feb 24 2009 Fedora Release Engineering - R12B-5.5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Feb 14 2009 Dennis Gilmore - R12B-4.5 -- fix sparc arches to compile - -* Fri Jan 16 2009 Tomas Mraz - R12B-4.4 -- rebuild with new openssl - -* Sat Oct 25 2008 Gerard Milmeister - R12B-4.1 -- new release R12B-4 - -* Fri Sep 5 2008 Gerard Milmeister - R12B-3.3 -- fixed sslrpath patch - -* Thu Jul 17 2008 Tom "spot" Callaway - R12B-3.2 -- fix license tag - -* Sun Jul 6 2008 Gerard Milmeister - R12B-3.1 -- new release R12B-3 - -* Thu Mar 27 2008 Gerard Milmeister - R12B-1.1 -- new release R12B-1 - -* Sat Feb 23 2008 Gerard Milmeister - R12B-0.3 -- disable strict aliasing optimization - -* Mon Feb 18 2008 Fedora Release Engineering - R12B-0.2 -- Autorebuild for GCC 4.3 - -* Sat Dec 8 2007 Gerard Milmeister - R12B-0.1 -- new release R12B-0 - -* Wed Dec 05 2007 Release Engineering - R11B-6 - - Rebuild for deps - -* Sun Aug 19 2007 Gerard Milmeister - R11B-5.3 -- fix some permissions - -* Sat Aug 18 2007 Gerard Milmeister - R11B-5.2 -- enable dynamic linking for ssl - -* Sat Aug 18 2007 Gerard Milmeister - R11B-5.1 -- new release R11B-5 - -* Sat Mar 24 2007 Thomas Fitzsimmons - R11B-2.4 -- Require java-1.5.0-gcj-devel for build. - -* Sun Dec 31 2006 Gerard Milmeister - R11B-2.3 -- remove buildroot from installed files - -* Sat Dec 30 2006 Gerard Milmeister - R11B-2.2 -- added patch for compiling with glibc 2.5 - -* Sat Dec 30 2006 Gerard Milmeister - R11B-2.1 -- new version R11B-2 - -* Mon Aug 28 2006 Gerard Milmeister - R11B-0.3 -- Rebuild for FE6 - -* Wed Jul 5 2006 Gerard Milmeister - R11B-0.2 -- add BR m4 - -* Thu May 18 2006 Gerard Milmeister - R11B-0.1 -- new version R11B-0 - -* Wed May 3 2006 Gerard Milmeister - R10B-10.3 -- added patch for run_erl by Knut-Håvard Aksnes - -* Mon Mar 13 2006 Gerard Milmeister - R10B-10.1 -- new version R10B-10 - -* Thu Dec 29 2005 Gerard Milmeister - R10B-9.1 -- New Version R10B-9 - -* Sat Oct 29 2005 Gerard Milmeister - R10B-8.2 -- updated rpath patch - -* Sat Oct 29 2005 Gerard Milmeister - R10B-8.1 -- New Version R10B-8 - -* Sat Oct 1 2005 Gerard Milmeister - R10B-6.4 -- Added tk-devel and tcl-devel to buildreq -- Added tk to req - -* Tue Sep 6 2005 Gerard Milmeister - R10B-6.3 -- Remove perl BuildRequires - -* Tue Aug 30 2005 Gerard Milmeister - R10B-6.2 -- change /usr/lib to %%{_libdir} -- redirect output in %%post to /dev/null -- add unixODBC-devel to BuildRequires -- split doc off to erlang-doc package - -* Sat Jun 25 2005 Gerard Milmeister - R10B-6.1 -- New Version R10B-6 - -* Sun Feb 13 2005 Gerard Milmeister - R10B-3.1 -- New Version R10B-3 - -* Mon Dec 27 2004 Gerard Milmeister - 0:R10B-2-0.fdr.1 -- New Version R10B-2 - -* Wed Oct 6 2004 Gerard Milmeister - 0:R10B-0.fdr.1 -- New Version R10B - -* Thu Oct 16 2003 Gerard Milmeister - 0:R9B-1.fdr.1 -- First Fedora release diff --git a/freeswitch.spec b/freeswitch.spec index 4cf49c2118..66bd762caa 100644 --- a/freeswitch.spec +++ b/freeswitch.spec @@ -37,7 +37,6 @@ %define build_mod_esl 0 %define build_mod_rayo 1 %define build_mod_ssml 1 -%define build_mod_shout 1 %define build_mod_opusfile 0 %define build_mod_v8 0 @@ -47,7 +46,6 @@ %{?with_py26_esl:%define build_py26_esl 1 } %{?with_timerfd:%define build_timerfd 1 } %{?with_mod_esl:%define build_mod_esl 1 } -%{?with_mod_shout:%define build_mod_shout 1 } %{?with_mod_opusfile:%define build_mod_opusfile 1 } %{?with_mod_v8:%define build_mod_v8 1 } @@ -176,6 +174,9 @@ Requires: libsndfile PreReq: %insserv_prereq %fillup_prereq %endif +%if 0%{?fedora} +BuildRequires: gumbo-parser-devel +%endif ###################################################################################################################### # @@ -1078,7 +1079,6 @@ Mod shell stream is a FreeSWITCH module to allow you to stream audio from an arbitrary shell command. You could use it to read audio from a database, from a soundcard, etc. -%if %{build_mod_shout} %package format-mod-shout Summary: Implements Media Steaming from arbitrary shell commands for the FreeSWITCH open source telephony platform Group: System/Libraries @@ -1093,7 +1093,6 @@ BuildRequires: lame-devel %description format-mod-shout Mod Shout is a FreeSWITCH module to allow you to stream audio from MP3s or a i shoutcast stream. -%endif %if %{build_mod_opusfile} %package format-mod-opusfile @@ -1503,10 +1502,7 @@ EVENT_HANDLERS_MODULES+=" event_handlers/mod_rayo" # ###################################################################################################################### FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_portaudio_stream \ - formats/mod_shell_stream formats/mod_sndfile formats/mod_tone_stream" -%if %{build_mod_shout} -FORMATS_MODULES+=" formats/mod_shout " -%endif + formats/mod_shell_stream formats/mod_shout formats/mod_sndfile formats/mod_tone_stream" %if %{build_mod_ssml} FORMATS_MODULES+=" formats/mod_ssml" %endif @@ -1622,6 +1618,7 @@ autoreconf --force --install --with-odbc \ --with-erlang \ --with-openssl \ +--enable-zrtp \ %{?configure_options} unset MODULES @@ -1645,6 +1642,7 @@ cd libs/esl %{__mkdir} -p %{buildroot}%{prefix}/log %{__mkdir} -p %{buildroot}%{logfiledir} %{__mkdir} -p %{buildroot}%{runtimedir} +%{__mkdir} -p %{buildroot}%{_localstatedir}/cache/freeswitch #install the esl stuff cd libs/esl @@ -2073,6 +2071,7 @@ fi %{MODINSTDIR}/mod_httapi.so* %files application-http-cache +%dir %attr(0750, freeswitch, daemon) %{_localstatedir}/cache/freeswitch %{MODINSTDIR}/mod_http_cache.so* %files application-lcr @@ -2324,10 +2323,8 @@ fi %files format-shell-stream %{MODINSTDIR}/mod_shell_stream.so* -%if %{build_mod_shout} %files format-mod-shout %{MODINSTDIR}/mod_shout.so* -%endif %if %{build_mod_ssml} %files format-ssml @@ -2344,18 +2341,15 @@ fi ###################################################################################################################### %files lua %{MODINSTDIR}/mod_lua*.so* -%dir %attr(0750, freeswitch, daemon) %{sysconfdir}/autoload_configs %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/lua.conf.xml %files perl %{MODINSTDIR}/mod_perl*.so* %{prefix}/perl/* -%dir %attr(0750, freeswitch, daemon) %{sysconfdir}/autoload_configs %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/perl.conf.xml %files python %{MODINSTDIR}/mod_python*.so* -%dir %attr(0750, freeswitch, daemon) %{sysconfdir}/autoload_configs %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/python.conf.xml %if %{build_mod_v8} @@ -2365,7 +2359,6 @@ fi %{LIBDIR}/libicui18n.so %{LIBDIR}/libicuuc.so %endif -%dir %attr(0750, freeswitch, daemon) %{sysconfdir}/autoload_configs %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/v8.conf.xml ######################################################################################################################