From: Ben Menadue Date: Tue, 11 Jun 2019 03:40:15 +0000 (-0700) Subject: LU-12269 build: remove %{fullrelease} from Provides X-Git-Tag: 2.12.3-RC1~159 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=a075a457fa373ebf5f002f1f48ed6c56d1ab4dd2;p=fs%2Flustre-release.git 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. This patch is back-ported from the following one: Lustre-commit: 48e16113731a1a9fff06370a0a11ea083ad290b8 Lustre-change: https://review.whamcloud.com/34883 Test-Parameters: trivial Signed-off-by: Ben Menadue Change-Id: Ia13f339f57b89c02443ebc2d68f0aa3b0802319a Reviewed-by: Jian Yu Reviewed-by: Li Dongyang Reviewed-on: https://review.whamcloud.com/35162 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin --- diff --git a/lustre.spec.in b/lustre.spec.in index 8845593..a4d5555 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