From 0d2b8aacd1a3bc36f803e5233235141b2605a923 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Wed, 4 Jul 2018 09:50:07 +0200 Subject: [PATCH] Fix GITPATCH computation Since the introduction of the syntcomp2018-submission tag (on a separate branch), that computation of GITPATCH was based on this tag because it was the last one (even if it is not on next). We did not see it on the Debian packages, because they clone only one branch of the repository, but the RPM packages had a different GITPATCH. * configure.ac (GITPATCH): Compute the number of commits since the last "spot-*" tag. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ceceb9d40..9f32c30cb 100644 --- a/configure.ac +++ b/configure.ac @@ -202,8 +202,8 @@ AC_CHECK_PROGS([SWIG], [swig3.0 swig], [swig]) AC_SUBST([CROSS_COMPILING], [$cross_compiling]) AC_SUBST([GITPATCH], [$(if (git rev-parse) >/dev/null 2>&1; then - echo ".$(git rev-list $(git rev-list --tags --no-walk --max-count=1)..HEAD \ - --count)" + echo ".$(git rev-list $(git rev-list --tags='spot-*' --no-walk \ + --max-count=1)..HEAD --count)" fi)]) AC_CONFIG_FILES([