rpms/dahdi-tools/devel dahdi-tools-modprobe_warn.diff, NONE, 1.1 dahdi-tools.spec, 1.8, 1.9 import.log, 1.1, 1.2
Itamar Reis Peixoto
itamarjp at fedoraproject.org
Wed Aug 19 23:03:15 UTC 2009
Author: itamarjp
Update of /cvs/pkgs/rpms/dahdi-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28083/devel
Modified Files:
dahdi-tools.spec import.log
Added Files:
dahdi-tools-modprobe_warn.diff
Log Message:
- fix 495453
dahdi-tools-modprobe_warn.diff:
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE dahdi-tools-modprobe_warn.diff ---
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))
Index: dahdi-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dahdi-tools/devel/dahdi-tools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dahdi-tools.spec 24 Jul 2009 19:55:59 -0000 1.8
+++ dahdi-tools.spec 19 Aug 2009 23:03:15 -0000 1.9
@@ -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 h
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 at 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 at lists.fedoraproject.org> - 2.1.0.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dahdi-tools/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 10 Oct 2008 12:31:18 -0000 1.1
+++ import.log 19 Aug 2009 23:03:15 -0000 1.2
@@ -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
More information about the fedora-extras-commits
mailing list