From 55294cac121f1ddfb33859e86b6db69e427122bb Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Oct 10 2008 12:59:24 +0000 Subject: - Cleanups suggested by reviewers --- diff --git a/.cvsignore b/.cvsignore index e69de29..f61aee1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,2 @@ +dahdi-linux-2.0.0.tar.gz +dahdi-tools-2.0.0.tar.gz diff --git a/dahdi-tools-2.0.0-init-status.patch b/dahdi-tools-2.0.0-init-status.patch new file mode 100644 index 0000000..6c7fc8b --- /dev/null +++ b/dahdi-tools-2.0.0-init-status.patch @@ -0,0 +1,22 @@ +diff --git a/dahdi.init b/dahdi.init +index e6b8608..0bbc479 100755 +--- a/dahdi.init ++++ b/dahdi.init +@@ -242,8 +242,16 @@ case "$1" in + fi + RETVAL=$? + ;; ++ status) ++ if [ -d /proc/dahdi ]; then ++ /usr/sbin/lsdahdi ++ RETVAL=0 ++ else ++ RETVAL=3 ++ fi ++ ;; + *) +- echo "Usage: dahdi {start|stop|restart|reload|unload}" ++ echo "Usage: dahdi {start|stop|restart|status|reload|unload}" + exit 1 + esac + diff --git a/dahdi-tools.spec b/dahdi-tools.spec new file mode 100644 index 0000000..e40de64 --- /dev/null +++ b/dahdi-tools.spec @@ -0,0 +1,171 @@ +%define tools_version 2.0.0 +%define linux_version 2.0.0 + +Name: dahdi-tools +Version: %{tools_version} +Release: 1%{?dist} +Summary: Userspace tools to configure the DAHDI kernel modules + +Group: System Environment/Libraries +License: GPLv2 and LGPLv2 +URL: http://www.asterisk.org/ + +Source0: http://downloads.digium.com/pub/telephony/dahdi-tools/releases/dahdi-tools-%{tools_version}.tar.gz +Source1: http://downloads.digium.com/pub/telephony/dahdi-linux/releases/dahdi-linux-%{linux_version}.tar.gz +# pulled from upstream SVN, revs 5072 and 5074 +Patch0: dahdi-tools-2.0.0-init-status.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: newt-devel +BuildRequires: libusb-devel +BuildRequires: perl + +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires(pre): %{_sbindir}/useradd +Requires(pre): %{_sbindir}/groupadd +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service + +%description +DAHDI stands for Digium Asterisk Hardware Device Interface. This +package contains the userspace tools to configure the DAHDI kernel +modules. DAHDI is the replacement for Zaptel, which must be renamed +due to trademark issues. + +%package libs +Summary: Library files for DAHDI +Group: Development/Libraries + +%description libs +The dahdi-tools-libs package contains libraries for accessing DAHDI hardware. + +%package devel +Summary: Development files for DAHDI +Group: Development/Libraries +Requires: dahdi-tools-libs = %{version}-%{release} + +%description devel +The dahdi-devel package contains libraries and header files for +developing applications that use DAHDI hardware. + +%prep +%setup0 -q -n dahdi-tools-%{tools_version} -a 1 +%patch0 -p1 +ln -s dahdi-linux-%{linux_version}/include include +%{__perl} -pi -e 's/chkconfig:\s([0-9]+)\s([0-9]+)\s([0-9]+)/chkconfig: - \2 \3/' dahdi.init + +%build + +pushd menuselect/mxml +%configure +popd + +pushd menuselect +%configure +popd + +%configure --disable-static --with-dahdi=`pwd` + +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}%{_initrddir} +make install config DESTDIR=%{buildroot} PERLLIBDIR=%{perl_vendorlib} +install -D -p -m 0644 include/dahdi/user.h %{buildroot}%{_includedir}/dahdi/user.h +find %{buildroot} -name '*.a' -exec rm -f {} ';' +ln -sf ../../..%{_datadir}/dahdi/xpp_fxloader %{buildroot}%{_sysconfdir}/hotplug/usb/xpp_fxloader + +%clean +rm -rf %{buildroot} + +%pre +%{_sbindir}/groupadd -r dahdi &>/dev/null || : +%{_sbindir}/useradd -r -s /sbin/nologin -d /usr/share/dahdi -M \ + -c 'DAHDI User' -g dahdi dahdi &>/dev/null || : + +%post +/sbin/chkconfig --add dahdi + +%preun +if [ "$1" -eq "0" ]; then + /sbin/service dahdi stop > /dev/null 2>&1 || : + /sbin/chkconfig --del dahdi +fi + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc README LICENSE LICENSE.LGPL +%dir %{_sysconfdir}/dahdi +%config(noreplace) %{_sysconfdir}/dahdi/init.conf +%config(noreplace) %{_sysconfdir}/dahdi/modules +%config(noreplace) %{_sysconfdir}/dahdi/system.conf +%{_sysconfdir}/hotplug/usb/xpp_fxloader +%config(noreplace) %{_sysconfdir}/hotplug/usb/xpp_fxloader.usermap +%config(noreplace) %{_sysconfdir}/modprobe.d/dahdi +%config(noreplace) %{_sysconfdir}/modprobe.d/dahdi.blacklist +%{_initrddir}/dahdi +%{_sbindir}/dahdi_cfg +%{_sbindir}/dahdi_genconf +%{_sbindir}/dahdi_hardware +%{_sbindir}/dahdi_monitor +%{_sbindir}/dahdi_registration +%{_sbindir}/dahdi_scan +%{_sbindir}/dahdi_speed +%{_sbindir}/dahdi_test +%{_sbindir}/dahdi_tool +%{_sbindir}/fpga_load +%{_sbindir}/fxotune +%{_sbindir}/lsdahdi +%{_sbindir}/xpp_blink +%{_sbindir}/xpp_sync +%dir %{_datadir}/dahdi +%{_datadir}/dahdi/xpp_fxloader +%{_mandir}/man8/dahdi_cfg.8.gz +%{_mandir}/man8/dahdi_genconf.8.gz +%{_mandir}/man8/dahdi_hardware.8.gz +%{_mandir}/man8/dahdi_monitor.8.gz +%{_mandir}/man8/dahdi_registration.8.gz +%{_mandir}/man8/dahdi_scan.8.gz +%{_mandir}/man8/dahdi_test.8.gz +%{_mandir}/man8/dahdi_tool.8.gz +%{_mandir}/man8/fpga_load.8.gz +%{_mandir}/man8/fxotune.8.gz +%{_mandir}/man8/lsdahdi.8.gz +%{_mandir}/man8/xpp_blink.8.gz +%{_mandir}/man8/xpp_sync.8.gz +%{perl_vendorlib}/Dahdi.pm +%{perl_vendorlib}/Dahdi + +%files libs +%defattr(-,root,root,-) +%doc LICENSE LICENSE.LGPL +%{_libdir}/*.so.* + +%files devel +%defattr(-,root,root,-) +%doc LICENSE LICENSE.LGPL +%{_includedir}/* +%{_libdir}/*.so + +%changelog +* Thu Oct 9 2008 Jeffrey C. Ollie - 2.0.0-1 +- Cleanups suggested by reviewers + +* Fri Oct 3 2008 Jeffrey C. Ollie - 2.0.0-0.4 +- Update to final release. + +* Wed Sep 10 2008 Jeffrey C. Ollie - 2.0.0-0.3.rc2 +- Install dahdi/user.h header + +* Mon Sep 8 2008 Jeffrey C. Ollie - 2.0.0-0.2.rc2 +- Update dahdi-linux to 2.0.0rc4 + +* Fri Sep 5 2008 Jeffrey C. Ollie - 2.0.0-0.1.rc2 +- First version for Fedora diff --git a/sources b/sources index e69de29..9681ad3 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +c09f880e67305bf5561c8030958b9fb9 dahdi-linux-2.0.0.tar.gz +31e48ed37e43662b0f8fbf146e192b66 dahdi-tools-2.0.0.tar.gz