X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=asterisk.spec;h=785ce0ba17ef8c3909e11ff7566624a3ebd464bf;hb=6cb756791765b364c10998a374580239e5555cb5;hp=91c8344083b7899478885ea61ccc4d64e23883b0;hpb=638c9ed5311bb86479603e852e90d6cbb6ff385c;p=packages%2Fasterisk.git

diff --git a/asterisk.spec b/asterisk.spec
index 91c8344..785ce0b 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -44,19 +44,19 @@
 #   package is updated to the version used by Asterisk, with all Asterisk
 #   patches applied and with configuration synced.
 
-%define pjproject_version	2.7.1
+%define pjproject_version	2.7.2
 
 %define	opus_commit	a6b9521f10817c1f39f21f90fecd3f00bbb164d0
 
 Summary:	Asterisk PBX
 Summary(pl.UTF-8):	Centralka (PBX) Asterisk
 Name:		asterisk
-Version:	15.2.2
-Release:	1
+Version:	15.6.0
+Release:	4
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	aadc45419967e71b652f4a8ba75e12e7
+# Source0-md5:	195f02b0c6118852525e027a1a610ea5
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.tmpfiles
@@ -69,16 +69,15 @@ Source7:	menuselect.makeopts
 Source8:	https://github.com/seanbright/asterisk-opus/archive/%{opus_commit}/asterisk-opus-%{opus_commit}.tar.gz
 # Source8-md5:	d2deae1095b6b42331d3060700c25493
 Source9:	https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/%{pjproject_version}/pjproject-%{pjproject_version}.tar.bz2
-# Source9-md5:	99a64110fa5c2debff40e0e8d4676380
-Patch0:		lua51-path.patch
+# Source9-md5:	fa3f0bc098c4bff48ddd92db1c016a7a
+Patch0:		lua_versions.patch
 Patch1:		%{name}-ppc.patch
 Patch2:		FHS-paths.patch
 Patch3:		pld-banner.patch
 Patch4:		lpc10-system.patch
 Patch5:		%{name}-histedit.patch
 Patch6:		x32.patch
-Patch7:		%{name}-ilbc.patch
-Patch8:		bundled_pjproject_libs.patch
+#Patch7:		%{name}-ilbc.patch
 URL:		http://www.asterisk.org/
 BuildRequires:	OSPToolkit-devel >= 4.0.0
 %{?with_oss:BuildRequires:	SDL-devel}
@@ -86,9 +85,6 @@ BuildRequires:	OSPToolkit-devel >= 4.0.0
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
-%if %{without system_pjproject} && %{with pjsip}
-BuildRequires:	bcg729-devel >= 1.0.2
-%endif
 # libbfd (used only for debug builds?)
 #BuildRequires:	binutils-devel
 BuildRequires:	bison >= 2
@@ -105,9 +101,10 @@ BuildRequires:	gcc >= 5:3.4
 # TODO: switch to 2.6
 BuildRequires:	gmime22-devel
 BuildRequires:	iksemel-devel
-BuildRequires:	imap-devel
+BuildRequires:	imap-devel >= 1:2007f-5
 %{?with_jack:BuildRequires:	jack-audio-connection-kit-devel}
-BuildRequires:	jansson-devel
+BuildRequires:	jansson-devel >= 2.11-2
+BuildRequires:	libatomic-devel
 BuildRequires:	libcap-devel
 BuildRequires:	libedit-devel
 BuildRequires:	libgsm-devel
@@ -121,7 +118,7 @@ BuildRequires:	libvorbis-devel
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	libxslt-devel
 BuildRequires:	lpc10-devel
-BuildRequires:	lua51-devel >= 5.1
+BuildRequires:	lua53-devel >= 5.3
 #BuildRequires:	mISDNuser-devel < 2
 %{?with_mysql:BuildRequires:	mysql-devel}
 BuildRequires:	ncurses-devel
@@ -148,7 +145,7 @@ BuildRequires:	speex-devel
 BuildRequires:	speexdsp-devel
 %{?with_sqlite2:BuildRequires:	sqlite-devel >= 2}
 BuildRequires:	sqlite3-devel
-BuildRequires:	srtp-devel
+BuildRequires:	libsrtp2-devel
 BuildRequires:	unbound-devel
 %{?with_odbc:BuildRequires:	unixODBC-devel}
 BuildRequires:	uriparser-devel
@@ -795,8 +792,6 @@ Dokumentacja API Asteriska.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
 
 %if %{with opus_vp8}
 
@@ -830,6 +825,7 @@ export WGET="/bin/true"
 
 %if %{without system_pjproject} && %{with pjsip}
 export EXTERNALS_CACHE_DIR="$PWD/externals"
+export PJPROJECT_CONFIGURE_OPTS="--disable-bcg729"
 %endif
 
 # be sure to invoke ./configure with our flags
@@ -847,6 +843,7 @@ cd ..
 
 %configure \
 	%{__without_if system_pjproject pjproject-bundled} \
+	--without-jansson-bundled \
 	--with-unbound \
 	%{__without oss SDL_image} \
 	%{__without bluetooth bluetooth} \
@@ -1309,7 +1306,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_bridge_media.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_iax2.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_mgcp.so
-%attr(755,root,root) %{_libdir}/asterisk/modules/chan_phone.so
+#%attr(755,root,root) %{_libdir}/asterisk/modules/chan_phone.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_rtp.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_sip.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/codec_a_mu.so
@@ -1436,7 +1433,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 # res_rtp_asterisk.so pulls some pjproject libs, but it still looks like a core module
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_rtp_asterisk.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_rtp_multicast.so
-%attr(755,root,root) %{_libdir}/asterisk/modules/res_sdp_translator_pjmedia.so
+#%attr(755,root,root) %{_libdir}/asterisk/modules/res_sdp_translator_pjmedia.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_security_log.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_smdi.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_sorcery_astdb.so