From 85eda7d644c3c50d47ef364844e2e75d83e35d9b Mon Sep 17 00:00:00 2001
From: Jan Pokorný <jpokorny@redhat.com>
Date: Oct 16 2017 20:44:47 +0000
Subject: 1.1.18-0.1.rc2 - Update for new upstream tarball


... for release candidate: Pacemaker-1.1.18-rc2,
for full details, see included ChangeLog file or
https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-1.1.18-rc2

Fix check scriptlet so as to work properly also with rpm<4.14 (not strictly
required since: https://github.com/rpm-software-management/rpm/pull/249,
but pragmatically follow the upstream)

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>

---

diff --git a/pacemaker.spec b/pacemaker.spec
index b2b16b7..5301df3 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -13,12 +13,12 @@
 ## Upstream pacemaker version, and its package version (specversion
 ## can be incremented to build packages reliably considered "newer"
 ## than previously built packages with the same pcmkversion)
-%global pcmkversion 1.1.17
+%global pcmkversion 1.1.18
 %global specversion 1
 
 ## Upstream commit (or git tag, such as "Pacemaker-" plus the
 ## {pcmkversion} macro for an official release) to use for this package
-%global commit Pacemaker-1.1.17
+%global commit Pacemaker-1.1.18-rc2
 ## 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
@@ -380,8 +380,9 @@ export LDFLAGS_HARDENED_LIB="%{?_hardening_ldflags}"
 make %{_smp_mflags} V=1 all
 
 %check
-# Prevent false positives in rpmlint
-./BasicSanity.sh -V pengine cli 2>&1 | sed s/[fF]ail/faiil/g
+{ ./BasicSanity.sh -V pengine cli 2>&1 && touch .CHECKED
+} | sed 's/[fF]ail/faiil/g'  # prevent false positives in rpmlint
+[ -f .CHECKED ] && rm -f -- .CHECKED || false
 
 %install
 make DESTDIR=%{buildroot} docdir=%{pcmk_docdir} V=1 install
@@ -686,6 +687,14 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Mon Oct 16 2017 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 1.1.18-0.1.rc2
+- Update for new upstream tarball for release candidate: Pacemaker-1.1.18-rc2,
+  for full details, see included ChangeLog file or
+  https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-1.1.18-rc2
+- Fix check scriptlet so as to work properly also with rpm<4.14 (not strictly
+  required since: https://github.com/rpm-software-management/rpm/pull/249,
+  but pragmatically follow the upstream)
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.17-1.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index 27ac343..621febb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (pacemaker-1.1.17.tar.gz) = 4e9dcea769686ba38ab80f8d6d25185c2a3d5a3f3ca0ecc7059d575e4fde40c2b786bf98d436e2f3b5ecf8b9c09d35289feb3add2fe64f3951dd8b7968826a4f
+SHA512 (pacemaker-1.1.18-rc2.tar.gz) = 9a127965e5021f9d35f73713cd1f39e8daff6c781548196292418bb277bef87149a604742ff671fabafc5b663485f2f22f7460de9fbfb48bdc5d062f79f2a9d1
 SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad