diff --git a/utils/docker/test_package/test-packages-installation.py b/utils/docker/test_package/test-packages-installation.py index ba5e0ee67f..d7efc9ee25 100644 --- a/utils/docker/test_package/test-packages-installation.py +++ b/utils/docker/test_package/test-packages-installation.py @@ -99,7 +99,7 @@ def get_incompatible_packages(packages_path, pkgconfig_directory, split_param): for line in out: if 'version=' in line: version = line.split('=')[1].strip(linesep) - if not version in PMDK_VERSION.replace('~', '-'): + if not version in PMDK_VERSION: incompatibe_packages.append(library) return incompatibe_packages diff --git a/utils/pkg-common.sh b/utils/pkg-common.sh index e4e8690373..ec1a608362 100644 --- a/utils/pkg-common.sh +++ b/utils/pkg-common.sh @@ -37,7 +37,7 @@ function check_tool() { } function get_version() { - echo -n $1 | sed "s/-rc/~rc/" + echo -n $1 | sed "s/-/~/g" } function get_os() { diff --git a/utils/pmdk.spec.in b/utils/pmdk.spec.in index 782619d753..8471bae167 100644 --- a/utils/pmdk.spec.in +++ b/utils/pmdk.spec.in @@ -415,6 +415,7 @@ make %{?_smp_mflags} \ %if %{without ndctl} NDCTL_ENABLE=n \ %endif + SRCVERSION=%{version} \ __MAKE_FLAGS__ @@ -424,6 +425,7 @@ make install DESTDIR=%{buildroot} \ %if %{without ndctl} NDCTL_ENABLE=n \ %endif + SRCVERSION=%{version} \ LIB_AR= \ prefix=%{_prefix} \ libdir=%{_libdir} \