rpms/dahdi-tools/devel dahdi-tools.spec,1.6,1.7

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/dahdi-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8412

Modified Files:
	dahdi-tools.spec 
Log Message:
* Fri May  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1.0.2-6
- Let dahdi-tools conflict with zaptel-utils (#472357).



Index: dahdi-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dahdi-tools/devel/dahdi-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dahdi-tools.spec	24 Feb 2009 10:42:09 -0000	1.6
+++ dahdi-tools.spec	8 May 2009 12:04:02 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           dahdi-tools
 Version:        %{tools_version}
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Userspace tools to configure the DAHDI kernel modules
 
 Group:          System Environment/Libraries
@@ -28,6 +28,9 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
+Conflicts:      zaptel-utils
+
+
 %description
 DAHDI stands for Digium Asterisk Hardware Device Interface. This
 package contains the userspace tools to configure the DAHDI kernel
@@ -157,6 +160,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Fri May  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1.0.2-6
+- Let dahdi-tools conflict with zaptel-utils (#472357).
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild