From 4d7571123ee6b03618b5f0fb093e15b12f21cdc5 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Jan 05 2009 00:12:10 +0000 Subject: - Update to latest. --- diff --git a/.cvsignore b/.cvsignore index f61aee1..1e693b0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -dahdi-linux-2.0.0.tar.gz -dahdi-tools-2.0.0.tar.gz +dahdi-linux-2.1.0.3.tar.gz +dahdi-tools-2.1.0.2.tar.gz diff --git a/dahdi-tools-2.0.0-init-status.patch b/dahdi-tools-2.0.0-init-status.patch deleted file mode 100644 index 6c7fc8b..0000000 --- a/dahdi-tools-2.0.0-init-status.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 index dc94047..a2ac830 100644 --- a/dahdi-tools.spec +++ b/dahdi-tools.spec @@ -1,5 +1,5 @@ -%define tools_version 2.0.0 -%define linux_version 2.0.0 +%define tools_version 2.1.0.2 +%define linux_version 2.1.0.3 Name: dahdi-tools Version: %{tools_version} @@ -13,7 +13,6 @@ 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) @@ -54,7 +53,6 @@ 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 @@ -130,6 +128,7 @@ fi %{_sbindir}/xpp_sync %dir %{_datadir}/dahdi %{_datadir}/dahdi/xpp_fxloader +%{_datadir}/dahdi/waitfor_xpds %{_mandir}/man8/dahdi_cfg.8.gz %{_mandir}/man8/dahdi_genconf.8.gz %{_mandir}/man8/dahdi_hardware.8.gz @@ -158,6 +157,9 @@ fi %{_libdir}/*.so %changelog +* Sun Jan 4 2009 Jeffrey C. Ollie - 2.1.0.2-4 +- Update to latest. + * Thu Nov 20 2008 Jeffrey C. Ollie - 2.0.0-4 - Fix zaptel-lib(s) conflicts diff --git a/sources b/sources index 9681ad3..d99fb41 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c09f880e67305bf5561c8030958b9fb9 dahdi-linux-2.0.0.tar.gz -31e48ed37e43662b0f8fbf146e192b66 dahdi-tools-2.0.0.tar.gz +4e2a294073a1375b8b3d33bbf4f607fe dahdi-linux-2.1.0.3.tar.gz +2e0c2866112932e54aacf3dc62f548ca dahdi-tools-2.1.0.2.tar.gz