[iprutils/f18] Prevent the RPM from conflicting with itself (BZ #856330) (David Aquilina)

[Karsten Hopp]

commit 02fb4a969820867f5504e6485e6d42555587186e
Author: Karsten Hopp <karsten at redhat.com>
Date:   Tue Sep 11 21:37:47 2012 +0200

    Prevent the RPM from conflicting with itself (BZ #856330) (David Aquilina)

 iprutils.spec |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/iprutils.spec b/iprutils.spec
index 0846b71..19346ce 100644
--- a/iprutils.spec
+++ b/iprutils.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for the IBM Power Linux RAID adapters
 Name:    iprutils
 Version: 2.3.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: CPL
 Group:   System Environment/Base
 URL:     http://sourceforge.net/projects/iprdd/
@@ -49,12 +49,10 @@ CFLAGS="%{optflags}" %{__make}
 # missing man page
 %{__install} -m 0755 %SOURCE1 %{buildroot}%{_mandir}/man8/
 
-# move all binaries from /sbin to /usr/sbin and
-# make symbolink links for all binaries in /sbin to /usr/sbin
+# move all binaries from /sbin to /usr/sbin
 mkdir %{buildroot}/usr/sbin
 for file in iprconfig iprdbg iprdump iprinit iprupdate; do
   mv %{buildroot}/sbin/$file %{buildroot}/usr/sbin/$file
-  ln -s /usr/sbin/$file %{buildroot}/sbin/$file
 done
 
 %post
@@ -73,12 +71,14 @@ done
 %files
 %defattr(-,root,root,-)
 %doc README LICENSE
-/sbin/*
-/usr/sbin/*
+%{_sbindir}/*
 %{_mandir}/man*/*
 %{_sysconfdir}/rc.d/init.d/*
 
 %changelog
+* Tue Sep 11 2012 David Aquilina <dwa at redhat.com> 2.3.11-2
+- Prevent the RPM from conflicting with itself (BZ #856330)
+
 * Wed Sep 05 2012 Karsten Hopp <karsten at redhat.com> 2.3.11-1
 - update to 2.3.11
 - enable on all archs as it now supports some adapters on them, too.