+# TODO: package /etc/dracut.conf.d/50-dahdi.conf
#
# Conditional build
-%bcond_with hotplug # old-style (pre-udev) hotplug support
+%bcond_without ppp # pppd plugin
#
-%include /usr/lib/rpm/macros.perl
Summary: DAHDI telephony device support
Summary(pl.UTF-8): Obsługa urządzeń telefonicznych DAHDI
Name: dahdi-tools
-Version: 2.9.0.1
+Version: 3.3.0
Release: 1
License: GPL v2
-Group: Base/Kernel
+Group: Applications/System
Source0: http://downloads.asterisk.org/pub/telephony/dahdi-tools/%{name}-%{version}.tar.gz
-# Source0-md5: ac17ca5b31eef8fd866e40c1e14363d9
+# Source0-md5: 237e35e7fc5def7d339b088656a7b983
Source1: dahdi.init
Source2: dahdi.sysconfig
-Patch0: %{name}-as-needed.patch
-Patch1: %{name}-perl-path.patch
-Patch2: %{name}-includes.patch
+Patch0: %{name}-includes.patch
+Patch1: %{name}-pppd.patch
URL: http://www.asterisk.org/
+BuildRequires: asciidoc
+BuildRequires: autoconf >= 2.59
+BuildRequires: automake
BuildRequires: dahdi-linux-devel >= 2.3.0
-BuildRequires: libusb-compat-devel >= 0.1
+BuildRequires: libpcap-devel
+BuildRequires: libtool
+BuildRequires: libusb-devel >= 1.0.9
BuildRequires: newt-devel
BuildRequires: perl-base
BuildRequires: perl-tools-pod
+BuildRequires: pkgconfig
+%{?with_ppp:BuildRequires: ppp-plugin-devel >= 3:2.5.0}
BuildRequires: rpm-perlprov >= 4.1-13
-BuildRequires: rpmbuild(macros) >= 1.379
-Obsoletes: dahdi-tools-utils
-Obsoletes: zaptel
-Obsoletes: zaptel-utils
+BuildRequires: rpmbuild(macros) >= 1.745
+Requires: libusb >= 1.0.9
+Obsoletes: dahdi-tools-utils < 2.6.1
+Obsoletes: zaptel < 2
+Obsoletes: zaptel-utils < 2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: dahdi-linux-devel
-Obsoletes: zaptel-devel
+Obsoletes: zaptel-devel < 2
%description devel
DAHDI development headers.
Requires(post,preun): /sbin/chkconfig
Requires: %{name} = %{version}-%{release}
Requires: rc-scripts
-Obsoletes: zaptel-init
+Obsoletes: zaptel-init < 2
%description init
DAHDI boot-time initialization.
%description init -l pl.UTF-8
Inicjalizacja DAHDI w czasie startu systemu.
-%package udev
+%package -n dracut-dahdi-tools
+Summary: dracut rules for DAHDI kernel modules
+Summary(pl.UTF-8): Reguły dracut dla modułów jądra Linuksa dla DAHDI
+Group: Applications/System
+Requires: %{name} >= 2.2.0
+Requires: dracut
+
+%description -n dracut-dahdi-tools
+dracut rules for DAHDI kernel modules.
+
+%description -n dracut-dahdi-tools -l pl.UTF-8
+Reguły dracut dla modułów jądra Linuksa dla DAHDI.
+
+%package -n udev-dahdi-tools
Summary: udev rules for DAHDI kernel modules
Summary(pl.UTF-8): Reguły udev dla modułów jądra Linuksa dla DAHDI
-Group: Base/Kernel
+Group: Applications/System
Obsoletes: dahdi-linux-udev < 2.9.0
+Obsoletes: dahdi-tools-udev < 3.1.0
Requires: %{name} >= 2.2.0
Requires: udev-core
-%description udev
+%description -n udev-dahdi-tools
udev rules for DAHDI kernel modules.
-%description udev -l pl.UTF-8
+%description -n udev-dahdi-tools -l pl.UTF-8
Reguły udev dla modułów jądra Linuksa dla DAHDI.
%package -n bash-completion-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 >= 3:2.5.0
+
+%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}"
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%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 config install \
- DESTDIR=$RPM_BUILD_ROOT
+%{__make} -j1 install install-config \
+ DESTDIR=$RPM_BUILD_ROOT \
+ PPPD_VERSION=plugins \
+ dracutconfdir=/etc/dracut.conf.d
+
+%{__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
# 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,}
-# old-style hotplug stuff
-%if %{without hotplug}
-%{__rm} $RPM_BUILD_ROOT/etc/hotplug/usb/xpp_*
-%endif
# used by upstream (but not PLD) init script
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/dahdi/{init.conf,modules}
+%{__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/system.conf
%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
-%if %{with hotplug}
-%attr(755,root,root) /etc/hotplug/usb/xpp_fxloader
-/etc/hotplug/usb/xpp_fxloader.usermap
-%endif
-%config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/dahdi.blacklist.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_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) %{_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_test.8*
-%{_mandir}/man8/dahdi_tool.8*
-%{_mandir}/man8/fxotune.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/dahdi_waitfor_span_assignments.8*
+%{_mandir}/man8/fxotune.8*
%files devel
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/dahdi
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dahdi
-%files udev
+%files -n udev-dahdi-tools
%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 dracut-dahdi-tools
+%defattr(644,root,root,755)
+/etc/dracut.conf.d/50-dahdi.conf
+
%files -n bash-completion-dahdi
%defattr(644,root,root,755)
/etc/bash_completion.d/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