- Include SRTP support (chan_sip complains without it)

[packages/asterisk.git] / asterisk.spec

diff --git a/asterisk.spec b/asterisk.spec
index f30758d046804732cb7cfb494ee6f10b7c74ebb2..a3c4ae79ff06d782d5668d6f2c0a8ad5358986c6 100644 (file)
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -18,6 +18,9 @@
 #   SS7=0 AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7])
 #   VPBAPI=0 AST_EXT_LIB_SETUP([VPB], [Voicetronix API], [vpb])
 # - %attr(755,root,root) %{_libdir}/asterisk/modules/chan_usbradio.so
+# - app_{rx,tx}fax seems to b replaced by app_fax alongside latest spanddsp
+#   See: http://sourceforge.net/projects/agx-ast-addons/
+#        https://agx-ast-addons.svn.sourceforge.net/svnroot/agx-ast-addons/trunk/attic/
 #
 # Conditional build:
 %bcond_with    rxfax           # without rx (also tx:-D) fax
@@ -26,27 +29,26 @@
 %bcond_with    zhone_hack      # huge hack workarounding broken zhone channel banks which start randomly
                                # issuing pulse-dialled calls to weird numbers
 %bcond_with    bristuff        # BRIstuff (Junghanns.NET BRI adapters) support
+%bcond_without h323            # with h323 support
 %bcond_without apidocs         # disable apidocs building
 %bcond_without verbose         # verbose build
 
 %define                spandsp_version 0.0.2pre26
-%define                rel     2
+%define                rel     0.1
 Summary:       Asterisk PBX
 Summary(pl.UTF-8):     Centralka (PBX) Asterisk
 Name:          asterisk
-Version:       1.6.2.10
+Version:       1.8.3.2
 Release:       %{rel}%{?with_bristuff:.bristuff}
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 50412a90942ae7306fb8dcc31a05c2ce
+# Source0-md5: 0bee03f4498a6081146a579b51130633
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source5:       %{name}.logrotate
-Source10:      http://soft-switch.org/downloads/spandsp/spandsp-%{spandsp_version}/asterisk-1.2.x/app_txfax.c
-# Source10-md5:        8c8fcb263b76897022b4c28052a7b439
-Source11:      http://soft-switch.org/downloads/spandsp/spandsp-%{spandsp_version}/asterisk-1.2.x/app_rxfax.c
-# Source11-md5:        ab6983b51c412883545b36993d704999
+Source10:      app_txfax.c
+Source11:      app_rxfax.c
 Patch0:                mxml-system.patch
 Patch1:                lua51-path.patch
 Patch2:                %{name}-no_k6_on_sparc.patch
@@ -69,7 +71,7 @@ Patch16:      lpc10-system.patch
 Patch17:       gsm-libpoison.patch
 Patch18:       Fix-history-loading-when-using-external-libedit.patch
 URL:           http://www.asterisk.org/
-BuildRequires: OSPToolkit-devel
+BuildRequires: OSPToolkit-devel >= 3.6.1
 BuildRequires: SDL_image-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: autoconf
@@ -79,6 +81,7 @@ BuildRequires:        bison
 BuildRequires: curl-devel
 BuildRequires: dahdi-linux-devel
 BuildRequires: dahdi-tools-devel >= 2.0.0
+BuildRequires: doxygen
 BuildRequires: freetds-devel >= 0.63
 BuildRequires: gawk
 BuildRequires: gcc >= 5:3.4
@@ -100,10 +103,13 @@ BuildRequires:    mISDNuser-devel
 BuildRequires: mxml-devel
 BuildRequires: mysql-devel
 BuildRequires: ncurses-devel
+BuildRequires: neon-devel
 BuildRequires: net-snmp-devel
 BuildRequires: newt-devel
 BuildRequires: openais-devel
+%if %{with h323}
 BuildRequires: openh323-devel >= 1.19.0
+%endif
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pam-devel
@@ -111,7 +117,9 @@ BuildRequires:      pkgconfig
 BuildRequires: popt-devel
 BuildRequires: portaudio-devel >= 19
 BuildRequires: postgresql-devel
+%if %{with h323}
 BuildRequires: pwlib-devel
+%endif
 BuildRequires: radiusclient-ng-devel
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
@@ -119,6 +127,7 @@ BuildRequires:      spandsp-devel >= 0.0.5
 BuildRequires: speex-devel
 BuildRequires: sqlite-devel
 BuildRequires: sqlite3-devel
+BuildRequires: srtp-devel
 BuildRequires: unixODBC-devel
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: zlib-devel
@@ -530,7 +539,7 @@ API documentation for Asterisk.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p0
-%patch6 -p0
+#%patch6 -p0
 %patch7 -p0
 %patch8 -p1
 %patch9 -p1
@@ -589,6 +598,7 @@ cd ..
        %{?with_bristuff:--with-gsmat=%{_prefix}} \
        --with-imap=system \
        --with-gsm=/usr \
+       %{!?with_h3232:--without-h323} \
        --with-lpc10=/usr \
        --with-libedit=yes
 
@@ -597,9 +607,11 @@ cd ..
 
 cp -f .cleancount .lastclean
 
+%if %{with h323}
 # included conditionally, so make sure its there first
 %{__make} -C channels/h323 Makefile.ast \
        %{?with_verbose:NOISY_BUILD=yes} \
+%endif
 
 %{__make} DEBUG= \
        OPTIMIZE= \
@@ -684,7 +696,7 @@ install -d $RPM_BUILD_ROOT{/var/{log/asterisk/cdr-csv,spool/asterisk/monitor},/e
 
 export ASTCFLAGS="%{rpmcflags}"
 
-%{__make} install \
+%{__make} -j1 install \
        DEBUG= \
        OPTIMIZE= \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -693,7 +705,7 @@ export ASTCFLAGS="%{rpmcflags}"
        ASTVARLIBDIR=%{_datadir}/asterisk \
        ASTDBDIR=%{_localstatedir}/spool/asterisk
 
-%{__make} samples \
+%{__make} -j1 samples \
        DEBUG= \
        OPTIMIZE= \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -714,8 +726,6 @@ install -D -p apps/app_voicemail_plain.so $RPM_BUILD_ROOT%{_libdir}/asterisk/mod
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
-install -D -p doc/asterisk-mib.txt $RPM_BUILD_ROOT%{_datadir}/mibs/ASTERISK-MIB.txt
-install -D -p doc/digium-mib.txt $RPM_BUILD_ROOT%{_datadir}/mibs/DIGIUM-MIB.txt
 
 # create some directories that need to be packaged
 install -d $RPM_BUILD_ROOT%{_datadir}/asterisk/moh
@@ -752,8 +762,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/asterisk/firmware/iax/*
 find doc/api/html -name '*.map' -size 0 -delete
 %endif
 
-rm $RPM_BUILD_ROOT%{_datadir}/asterisk/documentation/appdocsxml.dtd
-rm $RPM_BUILD_ROOT%{_datadir}/asterisk/documentation/core-en_US.xml
+#fixme
+rm  $RPM_BUILD_ROOT/etc/asterisk/{app_mysql,calendar,cdr_mysql,chan_mobile,chan_ooh323,h323,res_config_mysql,res_pktccops}.conf
+rm -fr $RPM_BUILD_ROOT/usr/include/asterisk/doxygen
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -788,22 +799,21 @@ chown -R asterisk:asterisk /var/lib/asterisk
 
 %files
 %defattr(644,root,root,755)
-%doc README* *.txt ChangeLog BUGS CREDITS configs
-%doc doc/{asterisk.sgml,PEERING} doc/{backtrace,callfiles,externalivr,macroexclusive,manager_1_1,modules,queue}.txt
-%doc doc/{rtp-packetization,siptls,smdi,sms,speechrec,ss7,video}.txt
+%doc README *.txt ChangeLog BUGS CREDITS configs
+%doc doc/asterisk.sgml
 
-%attr(755,root,root) %{_sbindir}/aelparse
+#%attr(755,root,root) %{_sbindir}/aelparse
 %attr(755,root,root) %{_sbindir}/astcanary
 %attr(755,root,root) %{_sbindir}/asterisk
 %attr(755,root,root) %{_sbindir}/astgenkey
 %attr(755,root,root) %{_sbindir}/autosupport
-%attr(755,root,root) %{_sbindir}/conf2ael
-%attr(755,root,root) %{_sbindir}/muted
+#%attr(755,root,root) %{_sbindir}/conf2ael
+#%attr(755,root,root) %{_sbindir}/muted
 %attr(755,root,root) %{_sbindir}/rasterisk
-%attr(755,root,root) %{_sbindir}/refcounter
-%attr(755,root,root) %{_sbindir}/smsq
-%attr(755,root,root) %{_sbindir}/stereorize
-%attr(755,root,root) %{_sbindir}/streamplayer
+#%attr(755,root,root) %{_sbindir}/refcounter
+#%attr(755,root,root) %{_sbindir}/smsq
+#%attr(755,root,root) %{_sbindir}/stereorize
+#%attr(755,root,root) %{_sbindir}/streamplayer
 %{_mandir}/man8/asterisk.8*
 %{_mandir}/man8/astgenkey.8*
 %{_mandir}/man8/autosupport.8*
@@ -814,15 +824,19 @@ chown -R asterisk:asterisk /var/lib/asterisk
 
 %attr(750,root,asterisk) %dir %{_sysconfdir}/asterisk
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/adsi.conf
-%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/adtranvofr.conf
+#%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/adtranvofr.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/agents.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/alarmreceiver.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/amd.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/asterisk.adsi
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/asterisk.conf
+%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/ccss.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cdr.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cdr_custom.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cdr_manager.conf
+%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cdr_syslog.conf
+%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cel.conf
+%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cel_custom.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cli.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cli_aliases.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cli_permissions.conf
@@ -849,6 +863,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/phoneprov.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/queuerules.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/queues.conf
+%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_stun_monitor.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/rpt.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/rtp.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/say.conf
@@ -868,6 +883,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_amd.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_authenticate.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_cdr.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/app_celgenuserevent.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_chanisavail.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_channelredirect.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_chanspy.so
@@ -929,11 +945,16 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/cdr_csv.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/cdr_custom.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/cdr_manager.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/cdr_syslog.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/cel_custom.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/cel_manager.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/cel_odbc.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_agent.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_bridge.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_iax2.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_local.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_mgcp.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/chan_multicast_rtp.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_phone.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_sip.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/codec_a_mu.so
@@ -942,6 +963,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/codec_g722.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/codec_g726.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/codec_ulaw.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/format_g719.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/format_g723.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/format_g726.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/format_g729.so
@@ -960,6 +982,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_audiohookinherit.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_base64.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_blacklist.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/func_callcompletion.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_callerid.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_cdr.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_channel.so
@@ -972,6 +995,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_enum.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_env.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_extstate.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/func_frame_trace.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_global.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_groupcount.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_iconv.so
@@ -980,11 +1004,13 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_math.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_md5.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_module.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/func_pitchshift.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_rand.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_realtime.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_sha1.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_shell.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_sprintf.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/func_srv.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_strings.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_sysinfo.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_timeout.so
@@ -1000,17 +1026,25 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_adsi.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_ael_share.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_agi.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/res_calendar.so
+#%attr(755,root,root) %{_libdir}/asterisk/modules/res_calendar_ews.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_clialiases.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_clioriginate.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_convert.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_crypto.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_limit.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_monitor.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/res_mutestream.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_musiconhold.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_phoneprov.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_realtime.so
+%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_security_log.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_smdi.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_speech.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/res_srtp.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/res_stun_monitor.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_timing_pthread.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_timing_timerfd.so
 #%attr(755,root,root) %{_libdir}/asterisk/modules/test_dlinklists.so
@@ -1025,11 +1059,15 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %dir %{_datadir}/asterisk/sounds
 %dir %attr(750,root,asterisk) %{_datadir}/asterisk/keys
 # no need to protect publicly downloaded and packaged .pub
-%{_datadir}/asterisk/keys/*.pub
+#%{_datadir}/asterisk/keys/*.pub
 %{_datadir}/asterisk/images/*.jpg
 %{_datadir}/asterisk/phoneprov
 %{_datadir}/asterisk/licenses
 
+%dir %{_datadir}/asterisk/documentation
+%{_datadir}/asterisk/documentation/appdocsxml.dtd
+%{_datadir}/asterisk/documentation/core-en_US.xml
+
 %attr(770,root,asterisk) %dir %{_localstatedir}/lib/asterisk
 %dir %attr(750,root,asterisk) %{_localstatedir}/lib/asterisk/licenses
 
@@ -1048,7 +1086,6 @@ chown -R asterisk:asterisk /var/lib/asterisk
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/{CODING-GUIDELINES,{datastores,modules,valgrind}.txt}
 %dir %{_includedir}/asterisk
 %{_includedir}/asterisk/*.h
 %{_includedir}/asterisk.h
@@ -1069,14 +1106,15 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/alsa.conf
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_alsa.so
 
-%files astman
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/astman
+#%files astman
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_sbindir}/astman
 
 %files curl
 %defattr(644,root,root,755)
 %doc contrib/scripts/dbsep.cgi
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/dbsep.conf
+%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_curl.conf
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_curl.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_config_curl.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_curl.so
@@ -1087,7 +1125,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/chan_dahdi.conf
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_dahdibarge.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_dahdiras.so
-%attr(755,root,root) %{_libdir}/asterisk/modules/app_dahdiscan.so
+#%attr(755,root,root) %{_libdir}/asterisk/modules/app_dahdiscan.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_flash.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_meetme.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_page.so
@@ -1101,7 +1139,9 @@ chown -R asterisk:asterisk /var/lib/asterisk
 
 %files fax
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/asterisk/modules/app_fax.so
+%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_fax.conf
+%attr(755,root,root) %{_libdir}/asterisk/modules/res_fax.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/res_fax_spandsp.so
 
 %files festival
 %defattr(644,root,root,755)
@@ -1115,10 +1155,12 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/format_gsm.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/format_wav_gsm.so
 
+%if %{with h323}
 %files h323
 %defattr(644,root,root,755)
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/h323.conf
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_h323.so
+%endif
 
 %files http
 %defattr(644,root,root,755)
@@ -1133,8 +1175,6 @@ chown -R asterisk:asterisk /var/lib/asterisk
 
 %files jabber
 %defattr(644,root,root,755)
-%doc doc/jabber.txt
-%doc doc/jingle.txt
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/gtalk.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/jabber.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/jingle.conf
@@ -1153,7 +1193,6 @@ chown -R asterisk:asterisk /var/lib/asterisk
 
 %files ldap
 %defattr(644,root,root,755)
-%doc doc/ldap.txt
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_ldap.conf
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_config_ldap.so
 
@@ -1182,10 +1221,12 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %defattr(644,root,root,755)
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cdr_adaptive_odbc.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cdr_odbc.conf
+%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cel_odbc.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/func_odbc.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_odbc.conf
 %attr(755,root,root) %{_libdir}/asterisk/modules/cdr_adaptive_odbc.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/cdr_odbc.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/cel_odbc.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_odbc.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_config_odbc.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_odbc.so
@@ -1208,14 +1249,17 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %files postgresql
 %defattr(644,root,root,755)
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cdr_pgsql.conf
+%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cel_pgsql.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_pgsql.conf
-%doc contrib/scripts/realtime_pgsql.sql
+%doc contrib/realtime/postgresql/realtime.sql
 %attr(755,root,root) %{_libdir}/asterisk/modules/cdr_pgsql.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/cel_pgsql.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_config_pgsql.so
 
 %files radius
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/asterisk/modules/cdr_radius.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/cel_radius.so
 
 %files resample
 %defattr(644,root,root,755)
@@ -1228,13 +1272,8 @@ chown -R asterisk:asterisk /var/lib/asterisk
 
 %files snmp
 %defattr(644,root,root,755)
-%doc doc/asterisk-mib.txt
-%doc doc/digium-mib.txt
-%doc doc/snmp.txt
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_snmp.conf
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_snmp.so
-%{_datadir}/mibs/ASTERISK-MIB.txt
-%{_datadir}/mibs/DIGIUM-MIB.txt
 
 %files speex
 %defattr(644,root,root,755)
@@ -1244,19 +1283,22 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %files sqlite
 %defattr(644,root,root,755)
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cdr_sqlite3_custom.conf
+%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cel_sqlite3_custom.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_config_sqlite.conf
 %attr(755,root,root) %{_libdir}/asterisk/modules/cdr_sqlite3_custom.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/cdr_sqlite.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/cel_sqlite3_custom.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_config_sqlite.so
 
 %files tds
 %defattr(644,root,root,755)
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cdr_tds.conf
+%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cel_tds.conf
 %attr(755,root,root) %{_libdir}/asterisk/modules/cdr_tds.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/cel_tds.so
 
 %files unistim
 %defattr(644,root,root,755)
-%doc doc/unistim.txt
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/unistim.conf
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_unistim.so
 
@@ -1277,7 +1319,6 @@ chown -R asterisk:asterisk /var/lib/asterisk
 
 %files voicemail-odbc
 %defattr(644,root,root,755)
-%doc doc/voicemail_odbc_postgresql.txt
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_directory_odbc.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_voicemail_odbc.so