From 5459eddd98002b12f196f9cc1b7d670922ba17a8 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Mon, 31 Mar 2008 13:24:33 +0000 Subject: [PATCH] Modify atftp and ipmitool spec files to explicitly conflict with the packages that are appropriate for them to conflict with. This will lead to a bit earlier and clearer error message, but yum still won't offer to deinstall like apt would --- atftp/atftp.spec | 5 +++-- ipmitool/ipmitool.spec | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/atftp/atftp.spec b/atftp/atftp.spec index c0da336..804c072 100644 --- a/atftp/atftp.spec +++ b/atftp/atftp.spec @@ -2,7 +2,7 @@ Name: atftp Summary: Advanced Trivial File Transfer Protocol (ATFTP) - TFTP server Group: System Environment/Daemons Version: 0.7 -Release: 1 +Release: 2 License: GPL Vendor: Linux Networx Inc. Source: atftp_0.7.dfsg.orig.tar.gz @@ -10,7 +10,8 @@ Source1: tftpd Patch: atftp_0.7.dfsg-3.diff Buildroot: /var/tmp/atftp-buildroot Packager: Allen Reese -Provides: tftp-server +#Provides: tftp-server +Conflicts: tftp-server %description diff --git a/ipmitool/ipmitool.spec b/ipmitool/ipmitool.spec index 496b9bd..a1f7eb1 100644 --- a/ipmitool/ipmitool.spec +++ b/ipmitool/ipmitool.spec @@ -1,8 +1,9 @@ Name: ipmitool Summary: ipmitool - Utility for IPMI control Version: 1.8.9 -Provides: OpenIPMI-tools = 2.0.6-5.el5.4 -Release: 2%{?_distro:.%{_distro}} +#Provides: OpenIPMI-tools = 2.0.6-5.el5.4 +Conflicts: OpenIPMI-tools +Release: 3 License: BSD Group: Utilities Packager: Duncan Laurie