]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
build-sys: bump also PACKAGE_VERSION_RELEASE number
authorKarel Zak <kzak@redhat.com>
Wed, 4 Nov 2015 15:02:44 +0000 (16:02 +0100)
committerKarel Zak <kzak@redhat.com>
Wed, 4 Nov 2015 16:19:41 +0000 (17:19 +0100)
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 <kzak@redhat.com>
configure.ac

index 56512c036fc20033271e4f95699151d30ccde23a..6748dd2a5fe59d6ce470b8706009c7c5a10a433a 100644 (file)
@@ -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 <major>.<minor>[-<suffix>]
 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"