keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: Tweak rpm version check for HAVE_NEW_RPM_VERIFY

Browse Source 
It seems like `4.14.2-rc1` orders later than `4.14.2`, which is causing
issues in f28 builds.

Also print the version of librpm at configure time.

Closes: #1515
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-08-23 15:05:37 -04:00 committed by Atomic Bot
parent 04c0678fa6
commit 53a98445e2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -118,9 +118,10 @@ AS_IF([pkg-config --atleast-version=4.13.0.1 rpm], [
AC_DEFINE([BUILDOPT_HAVE_RPMFILES], 1, [Set to 1 if we have rpmfiles API]) AC_DEFINE([BUILDOPT_HAVE_RPMFILES], 1, [Set to 1 if we have rpmfiles API])
], [have_modern_rpm=false]) ], [have_modern_rpm=false])
dnl See usage dnl See usage
AS_IF([pkg-config --atleast-version=4.14.2-rc1 rpm], [ AS_IF([pkg-config --atleast-version=4.14.2 rpm], [
AC_DEFINE([BUILDOPT_HAVE_NEW_RPM_VERIFY], 1, [Set to 1 if we have rpmtsSetVfyLevel]) AC_DEFINE([BUILDOPT_HAVE_NEW_RPM_VERIFY], 1, [Set to 1 if we have rpmtsSetVfyLevel])
]) ])
librpm_version="$(pkg-config rpm --modversion)"
AC_PATH_PROG([XSLTPROC], [xsltproc]) AC_PATH_PROG([XSLTPROC], [xsltproc])
@ -265,7 +266,7 @@ AC_OUTPUT
echo " echo "
$PACKAGE $VERSION $PACKAGE $VERSION
built with modern RPM (e.g. Fedora 25+): $have_modern_rpm built with modern RPM (e.g. Fedora 25+): $have_modern_rpm ($librpm_version)
nts name: $enable_new_name nts name: $enable_new_name
compose tooling: $enable_compose_tooling compose tooling: $enable_compose_tooling
introspection: $found_introspection introspection: $found_introspection