From b0e6b25e64e1c4cc4b7a67461a4b46fa32d480c0 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 4 Nov 2015 16:02:44 +0100 Subject: [PATCH] build-sys: bump also PACKAGE_VERSION_RELEASE number Now we bump only PACKAGE_VERSION_MAJOR and PACKAGE_VERSION_MINOR numbers. The PACKAGE_VERSION_RELEASE is always zero. These numbers are used for LIBxxx_VERSION strings and Version: field in the .pc files. Unfortunately, if we keep PACKAGE_VERSION_RELEASE= always zero then our bugfix releases are invisible for pkg-config. (Although I don't think it's good idea to depend in code on any library bugfix release, code should be about APIs). Addresses: https://github.com/systemd/systemd/pull/1754 Signed-off-by: Karel Zak --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 56512c036f..6748dd2a5f 100644 --- a/configure.ac +++ b/configure.ac @@ -3,6 +3,7 @@ AC_INIT([util-linux], [kzak@redhat.com],, [http://www.kernel.org/pub/linux/utils/util-linux/]) + AC_PREREQ([2.60]) AC_CONFIG_AUX_DIR([config]) @@ -22,7 +23,10 @@ dnl version details from .[-] PACKAGE_VERSION_MAJOR=$(echo $PACKAGE_VERSION | awk -F. '{print $1}') PACKAGE_VERSION_MINOR=$(echo $PACKAGE_VERSION | awk -F. '{print $2}' \ | awk -F- '{print $1}') -PACKAGE_VERSION_RELEASE=0 + +PACKAGE_VERSION_RELEASE=$(echo $PACKAGE_VERSION | awk -F. '{print $3}' \ + | sed 's/.*@<:@^@<:@:digit:@:>@@:>@.*/0/') + dnl libblkid version LIBBLKID_VERSION="$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_RELEASE" -- 2.39.5