From 869ddc77d8f710b734832883e156271536567f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= Date: Tue, 26 Apr 2016 11:06:11 +0200 Subject: [PATCH] 1.15-0.1.rc1 - Update for new upstream tarball for release candidate ...Pacemaker-1.1.15-rc1, for full details, see included ChangeLog file or https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-1.1.15-rc1 - Adapt spec file more akin to upstream version (also to reflect recent changes like ability to built explicitly without Publican-based docs) Note that patch disabling original built-in notification mechanism is no longer needed as the same is achieved natively in the sources, and there's brand new, more convoluted (and allegedly compatible) implementation of the same. --- ...rmd-re-enable-built-in-notifications.patch | 46 ------------------- pacemaker.spec | 35 ++++++++++---- sources | 2 +- 3 files changed, 28 insertions(+), 55 deletions(-) delete mode 100644 Revert-Low-crmd-re-enable-built-in-notifications.patch diff --git a/Revert-Low-crmd-re-enable-built-in-notifications.patch b/Revert-Low-crmd-re-enable-built-in-notifications.patch deleted file mode 100644 index 962b0ce..0000000 --- a/Revert-Low-crmd-re-enable-built-in-notifications.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 25ce4e9492b1ffea528b6d25b1b1bf82362c241e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= -Date: Thu, 31 Mar 2016 23:26:22 +0200 -Subject: [PATCH] Revert "Low: crmd: re-enable built-in notifications" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit ea4f3a711486b38f51b7a52d3b39f6d7b621b8da. - -That was a result of the initial iteration and more sophisticated -mechanism is down road[1], with an expectation that an attempt to use -the old will be strongly discouraged (to say the least). - -Make this apparent for new-comers to Pacemaker and/or users thinking -about the use of notifications that the old API is a dead end to -avoid frustration later on. - -[1] https://github.com/ClusterLabs/pacemaker/pull/950 - -Signed-off-by: Jan Pokorný ---- - crmd/control.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/crmd/control.c b/crmd/control.c -index 53d850e..f3d4732 100644 ---- a/crmd/control.c -+++ b/crmd/control.c -@@ -41,13 +41,6 @@ - #include - #include - --/* Enable support for built-in notifications -- * -- * The interface is expected to change significantly, and this will be defined -- * in the upstream master branch only until a new design is finalized. -- */ --#define RHEL7_COMPAT -- - qb_ipcs_service_t *ipcs = NULL; - - extern gboolean crm_connect_corosync(crm_cluster_t * cluster); --- -2.4.3 - diff --git a/pacemaker.spec b/pacemaker.spec index b6db711..e8d5fef 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -2,13 +2,18 @@ %global uname hacluster %global pcmk_docdir %{_docdir}/%{name} -%global specversion 2 -%global pcmkversion 1.1.14 +%global specversion 1 +%global pcmkversion 1.1.15 # set following to the actual commit or, for final release, concatenate # "pcmkversion" macro to "Pacemaker-" (will yield a tag per the convention) -%global commit 5a6cdd11b4f93b4d55e1b2654078018c339931d4 -%global shortcommit %(c=%{commit}; [ ${c} = Pacemaker-%{pcmkversion} ] && echo %{pcmkversion} || echo ${c:0:7}) -%global post_release %([ %{commit} = Pacemaker-%{pcmkversion} ]; echo $?) +%global commit Pacemaker-1.1.15-rc1 +%global lparen ( +%global rparen ) +%global shortcommit %(c=%{commit}; case ${c} in + Pacemaker-*%{rparen} echo ${c:10};; + *%{rparen} echo ${c:0:7};; esac) +%global pre_release %(s=%{shortcommit}; [ ${s: -4:3} != -rc ]; echo $?) +%global post_release %([ %{commit} = Pacemaker-%{shortcommit} ]; echo $?) %global github_owner ClusterLabs %global nagios_name nagios-agents-metadata @@ -56,11 +61,19 @@ %global debug_package %{nil} %endif +%if %{with pre_release} || 0%{pre_release} +%if 0%{pre_release} +%global pcmk_release 0.%{specversion}.%(s=%{shortcommit}; echo ${s: -3}) +%else +%global pcmk_release 0.%{specversion}.%{shortcommit}.git +%endif +%else %if 0%{post_release} %global pcmk_release %{specversion}.%{shortcommit}.git %else %global pcmk_release %{specversion} %endif +%endif Name: pacemaker Summary: Scalable High-Availability cluster resource manager @@ -73,7 +86,6 @@ Group: System Environment/Daemons Source0: https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Source1: https://github.com/%{github_owner}/%{nagios_name}/archive/%{nagios_hash}/%{nagios_name}-%{nagios_hash}.tar.gz # --- -Patch0: Revert-Low-crmd-re-enable-built-in-notifications.patch # keep following commented out for now #Patch100: bz1179335-system-wide-crypto-policies.patch @@ -263,7 +275,7 @@ monitor resources. # Force the local time # -# Git sets the file date to the date of the last commit. +# 'git' sets the file date to the date of the last commit. # This can result in files having been created in the future # when building on machines in timezones 'behind' the one the # commit occurred in - which seriously confuses 'make' @@ -276,6 +288,7 @@ find . -exec touch \{\} \; docdir=%{pcmk_docdir} %{configure} \ %{?with_profiling: --with-profiling} \ %{?with_coverage: --with-coverage} \ + %{!?with_doc: --with-brand=} \ --with-initdir=%{_initrddir} \ --localstatedir=%{_var} \ --with-version=%{version}-%{release} \ @@ -293,7 +306,6 @@ make %{_smp_mflags} V=1 docdir=%{pcmk_docdir} all make DESTDIR=%{buildroot} docdir=%{pcmk_docdir} V=1 install mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig -mkdir -p ${RPM_BUILD_ROOT}%{_var}/lib/pacemaker/cores install -m 644 mcp/pacemaker.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/pacemaker install -m 644 tools/crm_mon.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/crm_mon @@ -584,6 +596,13 @@ exit 0 %attr(0644,root,root) %{_datadir}/pacemaker/nagios/plugins-metadata/* %changelog +* Tue Apr 26 2016 Jan Pokorný - 1.1.15-0.1.rc1 +- Update for new upstream tarball for release candidate: Pacemaker-1.1.15-rc1, + for full details, see included ChangeLog file or + https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-1.1.15-rc1 +- Adapt spec file more akin to upstream version (also to reflect recent + changes like ability to built explicitly without Publican-based docs) + * Thu Mar 31 2016 Jan Pokorný - 1.1.14-2.5a6cdd1.git - Update for currently stabilized snapshot beyond Pacemaker-1.1.14 (commit 5a6cdd1), but restore old-style notifications to the state at diff --git a/sources b/sources index b766acd..ef3d752 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -79351df553d390d36d8a7ed5f0d6dfca pacemaker-5a6cdd1.tar.gz +e5aa9b364c9669fb04186a12406c5718 pacemaker-1.1.15-rc1.tar.gz b914b3c0f16d2ba21339fb54e166500e nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz