From 24e2d5eb01ccadf2505cdda26bfb6d5f1498bba3 Mon Sep 17 00:00:00 2001
From: Jan Pokorný <jpokorny@redhat.com>
Date: Feb 06 2017 17:45:36 +0000
Subject: 1.1.16-2.a39ea6491.git - Update for (slightly stabilized) snapshot


...beyond Pacemaker-1.1.16 (commit a39ea6491), including:
. prevent FTBFS with new GCC 7 (a7476dd96)

Adapt spec file more akin to upstream version including:
. better pre-release vs. tags logic (4581d4366)

---

diff --git a/pacemaker.spec b/pacemaker.spec
index 799bfe8..cfcc211 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -18,12 +18,16 @@
 
 ## Upstream commit (or git tag, such as "Pacemaker-" plus the
 ## {pcmkversion} macro for an official release) to use for this package
-%global commit Pacemaker-%{pcmkversion}
+%global commit a39ea6491a6e06b8575e8bb47059d8ff9f3d03e3
+## Since git v2.11, the extent of abbreviation is autoscaled by default
+## (used to be constant of 7), so we need to convey it for non-tags, too.
+%global commit_abbrev 9
 
 ## Nagios source control identifiers
 %global nagios_name nagios-agents-metadata
 %global nagios_hash 105ab8a7b2c16b9a29cf1c1596b80136eeef332b
 
+
 # Define globals for convenient use later
 
 ## Workaround to use parentheses in other globals
@@ -33,13 +37,15 @@
 ## Short version of git commit
 %define shortcommit %(c=%{commit}; case ${c} in
                       Pacemaker-*%{rparen} echo ${c:10};;
-                      *%{rparen} echo ${c:0:7};; esac)
+                      *%{rparen} echo ${c:0:%{commit_abbrev}};; esac)
 
-## Whether this is a release candidate
-%define pre_release %(s=%{shortcommit}; [ ${s: -4:3} != -rc ]; echo $?)
+## Whether this is a tagged release
+%define tag_release %([ %{commit} != Pacemaker-%{shortcommit} ]; echo $?)
 
-## Whether this is a development branch
-%define post_release %([ %{commit} = Pacemaker-%{shortcommit} ]; echo $?)
+## Whether this is a release candidate (in case of a tagged release)
+%define pre_release %(s=%{shortcommit}; [ "%{tag_release}" -eq 0 ] || {
+                                        case %{s} in *-rc[[:digit:]]*%{rparen} false;;
+                                        esac; }; echo $?)
 
 ## Turn off auto-compilation of python files outside site-packages directory,
 ## so that the -libs-devel package is multilib-compliant (no *.py[co] files)
@@ -99,17 +105,19 @@
 
 
 # Define the release version
-%if %{with pre_release} || 0%{pre_release}
+# (do not look at externally enforced pre-release flag for tagged releases
+# as only -rc tags, captured with the second condition, implies that then)
+%if (!%{tag_release} && %{with pre_release}) || 0%{pre_release}
 %if 0%{pre_release}
 %define pcmk_release 0.%{specversion}.%(s=%{shortcommit}; echo ${s: -3})
 %else
 %define pcmk_release 0.%{specversion}.%{shortcommit}.git
 %endif
 %else
-%if 0%{post_release}
-%define pcmk_release %{specversion}.%{shortcommit}.git
-%else
+%if 0%{tag_release}
 %define pcmk_release %{specversion}
+%else
+%define pcmk_release %{specversion}.%{shortcommit}.git
 %endif
 %endif
 
@@ -676,6 +684,13 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Mon Feb 06 2017 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 1.1.16-2.a39ea6491.git
+- Update for (slightly stabilized) snapshot beyond Pacemaker-1.1.16
+  (commit a39ea6491), including:
+  . prevent FTBFS with new GCC 7 (a7476dd96)
+- Adapt spec file more akin to upstream version including:
+  . better pre-release vs. tags logic (4581d4366)
+
 * Fri Dec 02 2016 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 1.1.16-1
 - Update for new upstream tarball: Pacemaker-1.1.16,
   for full details, see included ChangeLog file or
diff --git a/sources b/sources
index 73a9d0f..7ecf604 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a3b9d075bc9114ff698966e57e50bb12  pacemaker-1.1.16.tar.gz
-b914b3c0f16d2ba21339fb54e166500e  nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz
+SHA512 (pacemaker-a39ea6491.tar.gz) = 01bfda817790e49966f23cca77df70f5f6bdc2c3b057a2176c4ee722c83b206c378be599a7f006b3617b6260038ac271549a1246de2ff531bd488153a6076846
+SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad