30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
|
From e60d7ce8e748cb6d51552879c162d01aafa17160 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Marian Csontos <mcsontos@redhat.com>
|
||
|
|
Date: Wed, 15 Jun 2022 11:53:51 +0200
|
||
|
|
Subject: [PATCH 54/54] build: Fix make rpm with VERSION_DM without dash
|
||
|
|
|
||
|
|
When building RPM from a branch based on a release tag the expected -git
|
||
|
|
suffix is missing breaking the script producing error like following one:
|
||
|
|
|
||
|
|
error: line 215: Unterminated rich dependency: (2021-53.ge36b180a6.el9: Requires: device-mapper-devel >= 1.02.181 (2021-53.ge36b180a6.el9
|
||
|
|
---
|
||
|
|
Makefile.in | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile.in b/Makefile.in
|
||
|
|
index 3b7e0ecaa..f7a46269a 100644
|
||
|
|
--- a/Makefile.in
|
||
|
|
+++ b/Makefile.in
|
||
|
|
@@ -110,7 +110,7 @@ rpm: dist
|
||
|
|
$(LN_S) -f $(abs_top_srcdir)/spec/build.inc $(rpmbuilddir)/SOURCES
|
||
|
|
$(LN_S) -f $(abs_top_srcdir)/spec/macros.inc $(rpmbuilddir)/SOURCES
|
||
|
|
$(LN_S) -f $(abs_top_srcdir)/spec/packages.inc $(rpmbuilddir)/SOURCES
|
||
|
|
- DM_VER=$$(cut -d- -f1 $(top_srcdir)/VERSION_DM);\
|
||
|
|
+ DM_VER=$$(cut -d' ' -f1 $(top_srcdir)/VERSION_DM | cut -d- -f1);\
|
||
|
|
GIT_VER=$$(cd $(top_srcdir); git describe | cut -d- --output-delimiter=. -f2,3 || echo 0);\
|
||
|
|
$(SED) -e "s,\(device_mapper_version\) [0-9.]*$$,\1 $$DM_VER," \
|
||
|
|
-e "s,^\(Version:[^0-9%]*\)[0-9.]*$$,\1 $(LVM_VER)," \
|
||
|
|
--
|
||
|
|
2.34.3
|
||
|
|
|