From 7532409b3a0760a74e0bbaa86ecb3a0a2d0d011d Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Thu, 12 May 2016 19:53:54 -0600 Subject: [PATCH] LU-5834 build: obsolete lustre-client if installing server When installing the "lustre" (client+server) package, obsolete older lustre-client package so that it can install without error. Remove ancient Provides: and Obsoletes: lines from 1.2 days. Fix remaining Provides: and Obsoletes: and package Group: lines so they contain version numbers and names to make rpmlint happy. Test-Parameters: trivial Signed-off-by: Andreas Dilger Change-Id: Ifdd1d7567ab03d0d1dfa599b592b6f28e09cab07 Reviewed-on: https://review.whamcloud.com/20162 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Minh Diep Reviewed-by: Dmitry Eremin --- lustre-dkms.spec.in | 4 ++++ lustre.spec.in | 15 +++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lustre-dkms.spec.in b/lustre-dkms.spec.in index 6a1de4a..0527cb9 100644 --- a/lustre-dkms.spec.in +++ b/lustre-dkms.spec.in @@ -37,6 +37,10 @@ Requires: dkms >= 2.2.0.3-28.git.7c3e7c5 Requires: spl-dkms >= 0.6.1 Requires: zfs-dkms >= 0.6.1 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 %endif Requires: gcc, make, perl Requires: kernel-devel diff --git a/lustre.spec.in b/lustre.spec.in index 979fe56..6c41c9f 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -98,7 +98,7 @@ Name: %{lustre_name} Version: %{version} Release: 1%{?dist} License: GPL -Group: Utilities/System +Group: System Environment/Kernel Source: lustre-%{version}.tar.gz Source1: kmp-lustre.preamble Source2: kmp-lustre.files @@ -109,13 +109,12 @@ Source6: kmp-lustre-osd-zfs.files Source7: kmp-lustre-tests.files URL: https://wiki.hpdd.intel.com/ BuildRoot: %{_tmppath}/lustre-%{version}-root -Obsoletes: lustre-lite, lustre-lite-utils, lustre-ldap nfs-utils-lustre -Provides: lustre-lite = %{version}, lustre-lite-utils = %{version} Requires: %{requires_kmod_name} = %{requires_kmod_version} BuildRequires: libtool %if %{with servers} Requires: lustre-osd Requires: lustre-osd-mount +Obsoletes: lustre-client <= %{version} Provides: lustre-client = %{version}-%{release} %endif # GSS requires this: BuildRequires: pkgconfig, libgssapi-devel >= 0.10 @@ -142,8 +141,8 @@ Userspace tools and files for the Lustre file system. %if %{with lustre_utils} %package osd-ldiskfs-mount Summary: osd-ldiskfs-mount contains mount's ldiskfs specific dso. -Provides: lustre-osd-mount -Group: Development/Kernel +Provides: lustre-osd-mount = %{version}-%{fullrelease} +Group: System Environment/Kernel %description osd-ldiskfs-mount LDISKFS hooks for mount/mkfs into a dynamic library. @@ -156,8 +155,8 @@ LDISKFS hooks for mount/mkfs into a dynamic library. %if %{with lustre_utils} %package osd-zfs-mount Summary: osd-zfs-mount contains mount's zfs specific dso. -Provides: lustre-osd-mount -Group: Development/Kernel +Provides: lustre-osd-mount = %{version}-%{fullrelease} +Group: System Environment/Kernel %description osd-zfs-mount ZFS hooks for mount/mkfs into a dynamic library. @@ -181,7 +180,7 @@ environment for both Pacemaker and rgmanager. %package tests Summary: Lustre testing framework -Group: Development/Kernel +Group: System Environment/Kernel Provides: %{name}-tests = %{version} Requires: %{name} = %{version}, lustre-iokit Requires: %{requires_kmod_name} = %{requires_kmod_version} -- 1.8.3.1