[dlm] add conflicts with cman and clusterlib*

Fabio M. Di Nitto fabbione at fedoraproject.org
Thu Feb 2 10:21:16 UTC 2012


commit e641fe44f58303fad971e5bb5d17aad45f65bc58
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Thu Feb 2 11:21:01 2012 +0100

    add conflicts with cman and clusterlib*
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>

 dlm.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/dlm.spec b/dlm.spec
index 74d889c..27f68a5 100644
--- a/dlm.spec
+++ b/dlm.spec
@@ -1,6 +1,6 @@
 Name:           dlm
 Version:        3.99.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2 and GPLv2+ and LGPLv2+
 # For a breakdown of the licensing, see README.license
 Group:          System Environment/Kernel
@@ -16,6 +16,7 @@ Source0:	http://people.redhat.com/teigland/%{name}-%{version}.tar.gz
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
+Conflicts: cman
 
 %description
 The kernel dlm requires a user daemon to control cluster membership.
@@ -63,6 +64,7 @@ fi
 %package        lib
 Summary:        Library for %{name}
 Group:          System Environment/Libraries
+Conflicts:      clusterlib
 
 %description    lib
 The %{name}-lib package contains the libraries needed to use the dlm
@@ -81,6 +83,7 @@ from userland applications.
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name}-lib = %{version}-%{release}
+Conflicts:      clusterlib-devel
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -93,6 +96,9 @@ developing applications that use %{name}.
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Feb  2 2012 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.99.0-2
+- Add Conflicts with clusterlib/cman as necessary
+
 * Tue Jan 24 2012 David Teigland <teigland at redhat.com> - 3.99.0-1
 - initial package
 


More information about the scm-commits mailing list