From: Nathan Scott <nathans@sgi.com>
Date: Tue, 20 Mar 2001 03:09:12 +0000 (+0000)
Subject: change conflicts to provides at {russell,martin}'s suggestion.
X-Git-Tag: v1.2.0~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=585653e188908041815a2a6b20ccf36d5d3e1ead;p=thirdparty%2Fxfsprogs-dev.git

change conflicts to provides at {russell,martin}'s suggestion.
---

diff --git a/build/rpm/xfsprogs.spec.in b/build/rpm/xfsprogs.spec.in
index 4234cde98..0b326f4c6 100644
--- a/build/rpm/xfsprogs.spec.in
+++ b/build/rpm/xfsprogs.spec.in
@@ -5,7 +5,7 @@ Release: @pkg_release@
 Distribution: @pkg_distribution@
 Packager: @pkg_builder@
 BuildRoot: @build_root@ 
-Conflicts: xfs-cmds
+Provides: xfs-cmds
 Obsoletes: xfs-cmds
 Prereq: /sbin/ldconfig
 Source: @pkg_name@-@pkg_version@.src.tar.gz