rpms/dahdi-tools/devel dahdi-tools.spec,1.2,1.3

[Jeffrey C. Ollie]

Author: jcollie

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

Modified Files:
	dahdi-tools.spec 
Log Message:
* Sat Oct 25 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.0.0-3
- Add conflicts/requires to help make sure that we get dahdi-tools-libs and not zaptel-libs



Index: dahdi-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dahdi-tools/devel/dahdi-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dahdi-tools.spec	10 Oct 2008 19:12:09 -0000	1.2
+++ dahdi-tools.spec	25 Oct 2008 18:20:08 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           dahdi-tools
 Version:        %{tools_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Userspace tools to configure the DAHDI kernel modules
 
 Group:          System Environment/Libraries
@@ -22,6 +22,7 @@
 BuildRequires:  perl
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       dahdi-tools-libs = %{version}-%{release}
 Requires(pre):  %{_sbindir}/useradd
 Requires(pre):  %{_sbindir}/groupadd
 Requires(post): /sbin/chkconfig
@@ -37,6 +38,7 @@
 %package        libs
 Summary:        Library files for DAHDI
 Group:          Development/Libraries
+Conflicts:      zaptel-libs
 
 %description    libs
 The dahdi-tools-libs package contains libraries for accessing DAHDI hardware.
@@ -156,6 +158,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Sat Oct 25 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.0.0-3
+- Add conflicts/requires to help make sure that we get dahdi-tools-libs and not zaptel-libs
+
 * Fri Oct 10 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.0.0-2
 - Don't package sethdlc even if it gets built.