diff options
| author | Marian Csontos <mcsontos@redhat.com> | 2022-06-15 11:53:51 +0200 |
|---|---|---|
| committer | Marian Csontos <mcsontos@redhat.com> | 2023-01-27 12:36:24 +0100 |
| commit | 611b768134fe39ddfb2eec99eb5417e7e001d8cd (patch) | |
| tree | 175190c12fc0fbb8944268bfccc76bda0882b852 | |
| parent | 0441d340e752427d0d355a85e5e5e465e911a102 (diff) | |
| download | lvm2-611b768134fe39ddfb2eec99eb5417e7e001d8cd.tar.gz | |
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
(cherry picked from commit e60d7ce8e748cb6d51552879c162d01aafa17160)
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 1d5aff482..91b21b78c 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)," \ |