2.0.3-3 - include upstream fix for buildability with GCC 10 (PR #1968)

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

Refactor-attrd-properly-declare-global-variables.patch

@@ -0,0 +1,35 @@
+From 77a79358cc72174cbba0dd44e313f6d06d96dbf4 Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Thu, 2 Jan 2020 09:51:52 -0600
+Subject: [PATCH] Refactor: attrd: properly declare global variables as extern
+ in header
+
+Restores buildability with GCC 10
+---
+ daemons/attrd/pacemaker-attrd.h | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/daemons/attrd/pacemaker-attrd.h b/daemons/attrd/pacemaker-attrd.h
+index cc8e29ee1e..7b5ba03388 100644
+--- a/daemons/attrd/pacemaker-attrd.h
++++ b/daemons/attrd/pacemaker-attrd.h
+@@ -1,5 +1,7 @@
+ /*
+- * Copyright 2013-2018 Andrew Beekhof <andrew@beekhof.net>
++ * Copyright 2013-2020 the Pacemaker project contributors
++ *
++ * The version control history for this file may have further details.
+  *
+  * This source code is licensed under the GNU General Public License version 2
+  * or later (GPLv2+) WITHOUT ANY WARRANTY.
+@@ -106,8 +108,8 @@ typedef struct attribute_value_s {
+         gboolean seen;
+ } attribute_value_t;
+ 
+-crm_cluster_t *attrd_cluster;
+-GHashTable *attributes;
++extern crm_cluster_t *attrd_cluster;
++extern GHashTable *attributes;
+ 
+ #define attrd_send_ack(client, id, flags) \
+     crm_ipcs_send_ack((client), (id), (flags), "ack", __FUNCTION__, __LINE__)

pacemaker.spec

@@ -14,7 +14,7 @@
 ## can be incremented to build packages reliably considered "newer"
 ## than previously built packages with the same pcmkversion)
 %global pcmkversion 2.0.3
-%global specversion 2
+%global specversion 3
 
 ## Upstream commit (or git tag, such as "Pacemaker-" plus the
 ## {pcmkversion} macro for an official release) to use for this package
@@ -135,7 +135,7 @@
 Name:          pacemaker
 Summary:       Scalable High-Availability cluster resource manager
 Version:       %{pcmkversion}
-Release:       %{pcmk_release}%{?dist}.1
+Release:       %{pcmk_release}%{?dist}
 License:       GPLv2+ and LGPLv2+
 Url:           http://www.clusterlabs.org
 
@@ -145,6 +145,8 @@ Source1:       https://github.com/%{github_owner}/%{nagios_name}/archive/%{nagio
 # ---
 Patch0:        Build-fix-unability-to-build-with-Inkscape-1.0-beta-.patch
 Patch1:        https://github.com/ClusterLabs/pacemaker/commit/898d369f3bc770c0db2ad3973c204e6d11ec0e0f.patch#/Build-get-ready-for-implicit-fno-common-with-GCC10.patch
+Patch2:        https://github.com/ClusterLabs/pacemaker/commit/77a79358cc72174cbba0dd44e313f6d06d96dbf4.patch#/Refactor-attrd-properly-declare-global-variables.patch
+
 
 Requires:      resource-agents
 Requires:      %{name}-libs%{?_isa} = %{version}-%{release}
@@ -714,6 +716,9 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Wed March 04 2020 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 2.0.3-3
+- include upstream fix for buildability with GCC 10 (PR #1968)
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild