Update with suggestions from the Fedora reviewer.

- Obsolete, but don't Provide because supermin is not a compatible replacement.
- Use '_isa' to specify architecture of supermin-helper subpackage.

diff --git a/supermin.spec b/supermin.spec
index 04c7a37..414db1b 100644 (file)
--- a/supermin.spec
+++ b/supermin.spec
@@ -21,11 +21,14 @@ BuildRequires: prelink
 
 Requires:      yum >= 3.2
 Requires:      yum-utils
-Requires:      supermin-helper = %{version}-%{release}
+Requires:      supermin-helper%{?_isa} = %{version}-%{release}
 
 # https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries#Packages_granted_exceptions
 Provides:      bundled(gnulib)
 
+# NB: Does NOT Provides, because this is not a compatible replacement.
+Obsoletes:     febootstrap <= 3.21-1
+
 
 %description
 Supermin is a tool for building supermin appliances.  These are tiny
@@ -42,6 +45,9 @@ Requires:      /usr/sbin/mke2fs
 # RHBZ#771310
 Requires:      e2fsprogs-libs >= 1.42
 
+# NB: Does NOT Provides, because this is not a compatible replacement.
+Obsoletes:     febootstrap-supermin-helper <= 3.21-1
+
 
 %description helper
 %{name}-helper contains the runtime support for %{name}.
@@ -81,8 +87,10 @@ execstack -c $RPM_BUILD_ROOT%{_bindir}/supermin-helper
 
 %changelog
 * Tue Feb  5 2013 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-1
-- The program has been renamed 'supermin' from 'febootstrap'.
 - New upstream version 4.1.0.
+- The program has been renamed 'supermin' from 'febootstrap'.
+- Obsolete, but don't Provide because supermin is not a compatible replacement.
+- Use '_isa' to specify architecture of supermin-helper subpackage.
 
 * Tue Jan 22 2013 Richard W.M. Jones <rjones@redhat.com> - 1:3.21-2
 - Add upstream patch to drop supplemental groups (RHBZ#902476).