commit 7e9f440407963cbb31ef4029e0f0888d45699738
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sat Aug 7 10:04:49 2010 -0500
* Sat Aug 7 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.3.0-1
- Update to 2.3.0
.gitignore | 2 ++
dahdi-tools.spec | 32 +++++++++++++++++++++-----------
sources | 4 ++--
3 files changed, 25 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1e693b0..889dd66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
dahdi-linux-2.1.0.3.tar.gz
dahdi-tools-2.1.0.2.tar.gz
+dahdi-tools-2.3.0.tar.gz
+dahdi-linux-2.3.0.1.tar.gz
diff --git a/dahdi-tools.spec b/dahdi-tools.spec
index 5d10c30..2992497 100644
--- a/dahdi-tools.spec
+++ b/dahdi-tools.spec
@@ -1,18 +1,17 @@
-%define tools_version 2.1.0.2
-%define linux_version 2.1.0.3
+%define tools_version 2.3.0
+%define linux_version 2.3.0.1
Name: dahdi-tools
Version: %{tools_version}
-Release: 10%{?dist}
+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
+Source0: http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-%{tools_version}.tar.gz
+Source1: http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-%{linux_version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,9 +29,6 @@ Requires(preun): /sbin/service
Conflicts: zaptel-utils
-#patch from https://issues.asterisk.org/view.php?id=15454
-Patch0: dahdi-tools-modprobe_warn.diff
-
%description
DAHDI stands for Digium Asterisk Hardware Device Interface. This
package contains the userspace tools to configure the DAHDI kernel
@@ -61,8 +57,6 @@ developing applications that use DAHDI hardware.
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
-%patch0 -p2
-
%build
pushd menuselect/mxml
@@ -111,6 +105,7 @@ fi
%defattr(-,root,root,-)
%doc README LICENSE LICENSE.LGPL
%dir %{_sysconfdir}/dahdi
+%config(noreplace) %{_sysconfdir}/dahdi/genconf_parameters
%config(noreplace) %{_sysconfdir}/dahdi/init.conf
%config(noreplace) %{_sysconfdir}/dahdi/modules
%config(noreplace) %{_sysconfdir}/dahdi/system.conf
@@ -119,9 +114,14 @@ fi
%config(noreplace) %{_sysconfdir}/modprobe.d/dahdi.conf
%config(noreplace) %{_sysconfdir}/modprobe.d/dahdi.blacklist.conf
%{_initrddir}/dahdi
+%{_sbindir}/astribank_allow
+%{_sbindir}/astribank_hexload
+%{_sbindir}/astribank_is_starting
+%{_sbindir}/astribank_tool
%{_sbindir}/dahdi_cfg
%{_sbindir}/dahdi_genconf
%{_sbindir}/dahdi_hardware
+%{_sbindir}/dahdi_maint
%{_sbindir}/dahdi_monitor
%{_sbindir}/dahdi_registration
%{_sbindir}/dahdi_scan
@@ -131,11 +131,17 @@ fi
%{_sbindir}/fpga_load
%{_sbindir}/fxotune
%{_sbindir}/lsdahdi
+%{_sbindir}/twinstar
%{_sbindir}/xpp_blink
%{_sbindir}/xpp_sync
%dir %{_datadir}/dahdi
+%{_datadir}/dahdi/astribank_hook
%{_datadir}/dahdi/xpp_fxloader
%{_datadir}/dahdi/waitfor_xpds
+%{_mandir}/man8/astribank_allow.8.gz
+%{_mandir}/man8/astribank_hexload.8.gz
+%{_mandir}/man8/astribank_is_starting.8.gz
+%{_mandir}/man8/astribank_tool.8.gz
%{_mandir}/man8/dahdi_cfg.8.gz
%{_mandir}/man8/dahdi_genconf.8.gz
%{_mandir}/man8/dahdi_hardware.8.gz
@@ -147,6 +153,7 @@ fi
%{_mandir}/man8/fpga_load.8.gz
%{_mandir}/man8/fxotune.8.gz
%{_mandir}/man8/lsdahdi.8.gz
+%{_mandir}/man8/twinstar.8.gz
%{_mandir}/man8/xpp_blink.8.gz
%{_mandir}/man8/xpp_sync.8.gz
%{perl_vendorlib}/Dahdi.pm
@@ -164,6 +171,9 @@ fi
%{_libdir}/*.so
%changelog
+* Sat Aug 7 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.3.0-1
+- Update to 2.3.0
+
* Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 2.1.0.2-10
- Mass rebuild with perl-5.12.0
diff --git a/sources b/sources
index d99fb41..2f83fc9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4e2a294073a1375b8b3d33bbf4f607fe dahdi-linux-2.1.0.3.tar.gz
-2e0c2866112932e54aacf3dc62f548ca dahdi-tools-2.1.0.2.tar.gz
+6c9e2da70e4503e4d93f1ad0c83e61af dahdi-tools-2.3.0.tar.gz
+ac454f91d7e1267655ecd698832da414 dahdi-linux-2.3.0.1.tar.gz