From e3798abc314c5d4ea76c178acf8eb88779a5b9f9 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Fri, 21 Jun 2019 11:17:38 +0200 Subject: [PATCH] - Rebase to resource-agents 4.3.0 upstream release. --- resource-agents.spec | 22 +++++++++++----------- sources | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/resource-agents.spec b/resource-agents.spec index 33b8284..faeb37f 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -20,7 +20,7 @@ # %global upstream_prefix ClusterLabs-resource-agents -%global upstream_version b222ea88 +%global upstream_version 8f2684c6 # Whether this platform defaults to using systemd as an init system # (needs to be evaluated prior to BuildRequires being enumerated and @@ -51,8 +51,8 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts -Version: 4.2.0 -Release: 4%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Version: 4.3.0 +Release: 1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} @@ -77,7 +77,7 @@ BuildRequires: libnet-devel %endif %endif -%if 0%{?suse_version} +%if 0%{?suse_version} %if 0%{?suse_version} >= 1140 BuildRequires: libnet1 %else @@ -193,7 +193,7 @@ CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" export CFLAGS -%configure \ +%configure PYTHON="%{__python3}" \ %{conf_opt_fatal} \ %if %{defined _unitdir} --with-systemdsystemunitdir=%{_unitdir} \ @@ -226,7 +226,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents test -d %{buildroot}/sbin || mkdir %{buildroot}/sbin ( cd %{buildroot}/sbin - ln -sf /%{_sysconfdir}/init.d/ldirectord rcldirectord + ln -sf /%{_sysconfdir}/init.d/ldirectord rcldirectord ) || true %endif %endif @@ -341,11 +341,8 @@ ccs_update_schema > /dev/null 2>&1 ||: %{_sysconfdir}/ha.d/resource.d/ldirectord %if %{defined _unitdir} %{_unitdir}/ldirectord.service -%if 0%{?fedora} > 29 -%exclude %{_sysconfdir}/rc.d/init.d/ldirectord -%else %exclude %{_sysconfdir}/init.d/ldirectord -%endif +%exclude %{_sysconfdir}/rc.d/init.d/ldirectord %else %{_sysconfdir}/init.d/ldirectord %endif @@ -358,6 +355,9 @@ ccs_update_schema > /dev/null 2>&1 ||: %endif %changelog +* Fri Jun 21 2019 Oyvind Albrigtsen - 4.3.0-1 +- Rebase to resource-agents 4.3.0 upstream release. + * Fri May 24 2019 Oyvind Albrigtsen - 4.2.0-4 - Fix build issues @@ -444,7 +444,7 @@ ccs_update_schema > /dev/null 2>&1 ||: - Fix build system for rawhide. * Wed Oct 16 2013 David Vossel - 3.9.5-9 -- Remove rgmanager agents from build. +- Remove rgmanager agents from build. * Sun Aug 04 2013 Fedora Release Engineering - 3.9.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index a723ea3..a361598 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ClusterLabs-resource-agents-b222ea88.tar.gz) = 24143343e44004821ada6b76b626ea4478ad75e01d313171c04028ca57cc6848afb4fe1ed6c19d66a1002728d4f79813a18519f5d3a1ade4893de4278dd79753 +SHA512 (ClusterLabs-resource-agents-8f2684c6.tar.gz) = 4ab4cd1596369ee79c12217e12924295c3f1a5fe048b31638ac922af49b99e944e98a8eabe40144ba051e5129aa2a1b6e7a833a8fb0418d4b963568525a7bae8