From 48e16113731a1a9fff06370a0a11ea083ad290b8 Mon Sep 17 00:00:00 2001 From: Ben Menadue Date: Thu, 16 May 2019 15:14:56 +1000 Subject: [PATCH] LU-12269 build: remove %{fullrelease} from Provides Commit 7532409 adds a version number to lustre-osd-mount Provides lines in lustre.spec.in, but include the %{fullrelease} macro that was previously removed by 28c17d4. This causes an "unexpanded macro" warning when building the RPM, and the result contains a bogus string for that name, e.g. 2.12.53_45_g43fc4db-%{fullrelease} This patch simply removes the "-%{fullrelease}" suffix from these lines in lustre.spec.in. Test-Parameters: trivial Signed-off-by: Ben Menadue Change-Id: Ia13f339f57b89c02443ebc2d68f0aa3b0802319a Reviewed-on: https://review.whamcloud.com/34883 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Li Dongyang Reviewed-by: Oleg Drokin --- lustre.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre.spec.in b/lustre.spec.in index 8df403b..a226d5a 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -203,7 +203,7 @@ echo $TMPFILE %if %{with lustre_utils} %package osd-ldiskfs-mount Summary: osd-ldiskfs-mount contains mount's ldiskfs specific dso. -Provides: lustre-osd-mount = %{version}-%{fullrelease} +Provides: lustre-osd-mount = %{version} Group: System Environment/Kernel %description osd-ldiskfs-mount @@ -217,7 +217,7 @@ 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 = %{version}-%{fullrelease} +Provides: lustre-osd-mount = %{version} Group: System Environment/Kernel %description osd-zfs-mount -- 1.8.3.1