LU-9776 lustre-client cannot be installed if both client and server repos are configured

Due to current Obsoletes: tags on lustre-client, the client cannot be
installed on nodes where the client and server repos are configured.

Update the Obsoletes: to only obsolete previous lustre-client versions,
not the current one.

Signed-off-by: Brian J. Murrell <brian.murrell@intel.com>
Change-Id: Ie2f022967fd6f65030feeb23ea9637dce505054a
Reviewed-on: https://review.whamcloud.com/28065
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Minh Diep <minh.diep@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>

diff --git a/lustre-dkms.spec.in b/lustre-dkms.spec.in
index 0527cb9..09cfac1 100644 (file)
--- a/lustre-dkms.spec.in
+++ b/lustre-dkms.spec.in
@@ -40,7 +40,7 @@ Requires:       %{module}-osd-zfs-mount
 # If client package is installed when installing server, remove it since
 # the server package also includes the client.  This can be removed if/when
 # the packages are split into independent client/server/common packages.
-Obsoletes:     @PACKAGE@-client
+Obsoletes:     @PACKAGE@-client < %{version}
 %endif
 Requires:       gcc, make, perl
 Requires:       kernel-devel

diff --git a/lustre.spec.in b/lustre.spec.in
index 59a3352..8d066df 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -132,7 +132,7 @@ BuildRequires: libtool
 %if %{with servers}
 Requires: lustre-osd
 Requires: lustre-osd-mount
-Obsoletes: lustre-client <= %{version}
+Obsoletes: lustre-client < %{version}
 Provides: lustre-client = %{version}-%{release}
 %endif
 # GSS requires this: BuildRequires: pkgconfig, libgssapi-devel >= 0.10