-# TODO:
-# warning: Installed (but unpackaged) file(s) found:
-# /etc/hotplug/usb/xpp_fxloader
-# /etc/hotplug/usb/xpp_fxloader.usermap
#
-%include /usr/lib/rpm/macros.perl
+# Conditional build
+%bcond_without ppp # pppd plugin
+#
Summary: DAHDI telephony device support
Summary(pl.UTF-8): Obsługa urządzeń telefonicznych DAHDI
Name: dahdi-tools
-Version: 2.6.2
+Version: 2.11.1
Release: 1
License: GPL v2
-Group: Base/Kernel
-Source0: http://downloads.digium.com/pub/telephony/dahdi-tools/%{name}-%{version}.tar.gz
-# Source0-md5: bd23765d25869d9bad70849e762b171b
+Group: Applications/System
+Source0: http://downloads.asterisk.org/pub/telephony/dahdi-tools/%{name}-%{version}.tar.gz
+# Source0-md5: 8a908640d0ff7f8cbcdccd23f5022ede
Source1: dahdi.init
Source2: dahdi.sysconfig
-Patch0: %{name}-as-needed.patch
-Patch1: %{name}-perl-path.patch
-Patch2: %{name}-includes.patch
+Patch0: %{name}-includes.patch
URL: http://www.asterisk.org/
BuildRequires: dahdi-linux-devel >= 2.3.0
+BuildRequires: libpcap-devel
+BuildRequires: libusb-devel >= 1.0.9
BuildRequires: newt-devel
BuildRequires: perl-base
BuildRequires: perl-tools-pod
+%{?with_ppp:BuildRequires: ppp-plugin-devel}
BuildRequires: rpm-perlprov >= 4.1-13
BuildRequires: rpmbuild(macros) >= 1.379
+Requires: libusb >= 1.0.9
Obsoletes: dahdi-tools-utils
Obsoletes: zaptel
Obsoletes: zaptel-utils
%description init -l pl.UTF-8
Inicjalizacja DAHDI w czasie startu systemu.
+%package udev
+Summary: udev rules for DAHDI kernel modules
+Summary(pl.UTF-8): Reguły udev dla modułów jądra Linuksa dla DAHDI
+Group: Applications/System
+Obsoletes: dahdi-linux-udev < 2.9.0
+Requires: %{name} >= 2.2.0
+Requires: udev-core
+
+%description udev
+udev rules for DAHDI kernel modules.
+
+%description udev -l pl.UTF-8
+Reguły udev dla modułów jądra Linuksa dla DAHDI.
+
+%package -n bash-completion-dahdi
+Summary: Bash completion for DAHDI commands
+Summary(pl.UTF-8): Bashowe dopełnianie składni dla poleceń DAHDI
+Group: Applications/Shells
+Requires: %{name} = %{version}-%{release}
+Requires: bash-completion
+
+%description -n bash-completion-dahdi
+Bash completion for DAHDI commands.
+
+%description -n bash-completion-dahdi -l pl.UTF-8
+Bashowe dopełnianie składni dla poleceń DAHDI.
+
%package -n perl-Dahdi
Summary: Perl interface to DAHDI
Summary(pl.UTF-8): Perlowy interfejs do DAHDI
%description -n perl-Dahdi -l pl.UTF-8
Perlowy interfejs do DAHDI.
+%package -n ppp-plugin-dahdi
+Summary: DAHDI plugin for PPP daemon
+Summary(pl.UTF-8): Wtyczka DAHDI dla demona PPP
+Group: Libraries
+Requires: ppp
+
+%description -n ppp-plugin-dahdi
+DAHDI plugin for PPP daemon.
+
+%description -n ppp-plugin-dahdi -l pl.UTF-8
+Wtyczka DAHDI dla demona PPP.
+
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
cat > download-logger <<'EOF'
#!/bin/sh
chmod a+rx download-logger
%build
-%configure
-%{__make} \
- CC="%{__cc}" \
- OPTFLAGS="%{rpmcppflags} %{rpmcflags}"
+%configure \
+ --disable-silent-rules \
+ --with-perllib=%{perl_vendorlib} \
+ %{!?with_ppp:--without-ppp}
+
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-
install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
-%{__make} -j1 install \
- DESTDIR=$RPM_BUILD_ROOT
+%{__make} -j1 install install-config \
+ DESTDIR=$RPM_BUILD_ROOT \
+ PPPD_VERSION=plugins
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libtonezone.la
+%if %{with ppp}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/plugins/dahdi.{la,a}
+%endif
+
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/dahdi
install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/dahdi
touch $RPM_BUILD_ROOT%{_sysconfdir}/dahdi.conf
+# sample configuration files - nothing enabled by default, so safe to install
+%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/dahdi/assigned-spans.conf{.sample,}
+%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/dahdi/span-types.conf{.sample,}
+%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/dahdi/system.conf{.sample,}
+
+# used by upstream (but not PLD) init script
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/dahdi/{init.conf,modules.sample}
+
%clean
rm -rf $RPM_BUILD_ROOT
%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dahdi.conf
%dir %{_sysconfdir}/dahdi
%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dahdi/system.conf
-#/etc/hotplug/usb/xpp_fxloader
-#/etc/hotplug/usb/xpp_fxloader.usermap
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dahdi/assigned-spans.conf
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dahdi/span-types.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/dahdi-blacklist.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/dahdi.conf
%attr(755,root,root) %{_sbindir}/astribank_*
%attr(755,root,root) %{_sbindir}/dahdi_cfg
%attr(755,root,root) %{_sbindir}/dahdi_maint
%attr(755,root,root) %{_sbindir}/dahdi_speed
%attr(755,root,root) %{_sbindir}/dahdi_test
%attr(755,root,root) %{_sbindir}/dahdi_tool
-%attr(755,root,root) %{_sbindir}/fpga_load
+%attr(755,root,root) %{_sbindir}/dahdi_span_assignments
+%attr(755,root,root) %{_sbindir}/dahdi_span_types
+%attr(755,root,root) %{_sbindir}/dahdi_waitfor_span_assignments
%attr(755,root,root) %{_sbindir}/fxotune
%attr(755,root,root) %{_sbindir}/sethdlc
-%attr(755,root,root) %{_libdir}/libtonezone.so.1.*
-%attr(755,root,root) %ghost %{_libdir}/libtonezone.so.1
+%attr(755,root,root) %{_sbindir}/xtalk_send
%attr(755,root,root) %{_libdir}/libtonezone.so.2.*
%attr(755,root,root) %ghost %{_libdir}/libtonezone.so.2
%{_datadir}/dahdi
%{_mandir}/man8/dahdi_maint.8*
%{_mandir}/man8/dahdi_monitor.8*
%{_mandir}/man8/dahdi_scan.8*
+%{_mandir}/man8/dahdi_span_assignments.8*
+%{_mandir}/man8/dahdi_span_types.8*
%{_mandir}/man8/dahdi_test.8*
%{_mandir}/man8/dahdi_tool.8*
-%{_mandir}/man8/fpga_load.8*
+%{_mandir}/man8/dahdi_waitfor_span_assignments.8*
%{_mandir}/man8/fxotune.8*
+%{_mandir}/man8/xtalk_send.8*
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_sbindir}/twinstar
%attr(755,root,root) %{_sbindir}/xpp_blink
%attr(755,root,root) %{_sbindir}/xpp_sync
+# for dahdi_genconf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dahdi/genconf_parameters
%{_mandir}/man8/dahdi_genconf.8*
%{_mandir}/man8/dahdi_hardware.8*
%{_mandir}/man8/dahdi_registration.8*
%attr(754,root,root) /etc/rc.d/init.d/dahdi
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dahdi
+%files udev
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/dahdi.rules
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/xpp.rules
+
+%files -n bash-completion-dahdi
+%defattr(644,root,root,755)
+/etc/bash_completion.d/dahdi
+
%files -n perl-Dahdi
%defattr(644,root,root,755)
%{perl_vendorlib}/Dahdi
%{perl_vendorlib}/Dahdi.pm
+
+%if %{with ppp}
+%files -n ppp-plugin-dahdi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/pppd/plugins/dahdi.so
+%endif