From: Nathan Scott <nathans@sgi.com>
Date: Tue, 20 Mar 2001 04:12:26 +0000 (+0000)
Subject: the devel package can no longer conflict with xfs-cmds as xfsprogs
X-Git-Tag: v1.2.0~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69cc4c3dfde75a1fb366862645086850d2670c74;p=thirdparty%2Fxfsprogs-dev.git

the devel package can no longer conflict with xfs-cmds as xfsprogs
provides xfs-cmds, whoever it does require xfsprogs so should all
come out OK.
---

diff --git a/build/rpm/xfsprogs.spec.in b/build/rpm/xfsprogs.spec.in
index 0b326f4c6..30bbbe1eb 100644
--- a/build/rpm/xfsprogs.spec.in
+++ b/build/rpm/xfsprogs.spec.in
@@ -32,7 +32,6 @@ with the IRIX version of XFS.
 Summary: XFS filesystem-specific static libraries and headers.
 Group: Development/Libraries
 Requires: @pkg_name@
-Conflicts: xfs-cmds
 
 %description devel
 xfsprogs-devel contains the libraries and header files needed to