From efbe2fc514a4ed8a3acedb88dbc7ae9fe4c76518 Mon Sep 17 00:00:00 2001
From: Itamar Reis Peixoto <itamarjp@fedoraproject.org>
Date: Aug 19 2009 23:03:15 +0000
Subject: - fix 495453


---

diff --git a/dahdi-tools-modprobe_warn.diff b/dahdi-tools-modprobe_warn.diff
new file mode 100644
index 0000000..b351cb0
--- /dev/null
+++ b/dahdi-tools-modprobe_warn.diff
@@ -0,0 +1,14 @@
+diff -ruNp a/dahdi-tools-2.1.0.2/Makefile b/dahdi-tools-2.1.0.2/Makefile
+--- a/dahdi-tools-2.1.0.2/Makefile	2008-12-15 18:19:07.000000000 -0200
++++ b/dahdi-tools-2.1.0.2/Makefile	2009-08-19 19:37:35.489155883 -0300
+@@ -69,8 +69,8 @@ endif
+ 
+ RCCONF_FILE	= /etc/dahdi/init.conf
+ MODULES_FILE	= /etc/dahdi/modules
+-MODPROBE_FILE	= /etc/modprobe.d/dahdi
+-BLACKLIST_FILE	= /etc/modprobe.d/dahdi.blacklist
++MODPROBE_FILE	= /etc/modprobe.d/dahdi.conf
++BLACKLIST_FILE	= /etc/modprobe.d/dahdi.blacklist.conf
+ 
+ NETSCR_DIR	:= $(firstword $(wildcard $(DESTDIR)/etc/sysconfig/network-scripts ))
+ ifneq (,$(NETSCR_DIR))
diff --git a/dahdi-tools.spec b/dahdi-tools.spec
index 9409caf..dec4e86 100644
--- a/dahdi-tools.spec
+++ b/dahdi-tools.spec
@@ -3,7 +3,7 @@
 
 Name:           dahdi-tools
 Version:        %{tools_version}
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Userspace tools to configure the DAHDI kernel modules
 
 Group:          System Environment/Libraries
@@ -30,6 +30,8 @@ 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
@@ -59,6 +61,8 @@ 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
@@ -112,8 +116,8 @@ fi
 %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
+%config(noreplace) %{_sysconfdir}/modprobe.d/dahdi.conf
+%config(noreplace) %{_sysconfdir}/modprobe.d/dahdi.blacklist.conf
 %{_initrddir}/dahdi
 %{_sbindir}/dahdi_cfg
 %{_sbindir}/dahdi_genconf
@@ -160,6 +164,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Wed Aug 19 2009 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 2.1.0.2-8
+- fix bz 495453 (/etc/modprobe.d/dahdi.blacklist and /etc/modprobe.d/dahdi doesn't end with.conf)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/import.log b/import.log
index fda32f0..941031f 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 dahdi-tools-2_0_0-1_fc9:HEAD:dahdi-tools-2.0.0-1.fc9.src.rpm:1223641844
+dahdi-tools-2_1_0_2-8_fc12:HEAD:dahdi-tools-2.1.0.2-8.fc12.src.rpm:1250722881