diff --git a/no-cluster-glue.patch b/no-cluster-glue.patch index 9a9e8f5..e133334 100644 --- a/no-cluster-glue.patch +++ b/no-cluster-glue.patch @@ -7,7 +7,7 @@ index fa417ee..be888af 100644 dnl * Check for netinet/icmp6.h to enable the IPv6addr resource agent AC_CHECK_HEADERS(netinet/icmp6.h,[],[],[#include ]) -AM_CONDITIONAL(USE_IPV6ADDR, test "$ac_cv_header_netinet_icmp6_h" = yes ) -+AM_CONDITIONAL(USE_IPV6ADDR, test "$ac_cv_header_netinet_icmp6_h" = yes && "$ac_cv_header_heartbeat_glue_config_h" = yes) ++AM_CONDITIONAL(USE_IPV6ADDR, test "$ac_cv_header_netinet_icmp6_h" = yes && test "$ac_cv_header_heartbeat_glue_config_h" = yes) dnl ======================================================================== dnl Compiler flags diff --git a/resource-agents.spec b/resource-agents.spec index 43faf8b..7a7d7ee 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -33,7 +33,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 3.9.5 -Release: 2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 3%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPLv2+ and LGPLv2+ URL: http://to.be.defined.com/ %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} @@ -118,7 +118,7 @@ Group: Productivity/Clustering/HA %endif Obsoletes: heartbeat-ldirectord <= %{version} Provides: heartbeat-ldirectord = %{version} -%if 0%{?fedora} > 18 +%if 0%{?fedora} > 18 || 0%{?centos_version} > 6 || 0%{?rhel} > 6 BuildRequires: perl-podlators %endif Requires: %{SSLeay} perl-libwww-perl perl-MailTools @@ -307,6 +307,11 @@ ccs_update_schema > /dev/null 2>&1 ||: %endif %changelog +* Tue Mar 12 2013 David Vossel - 3.9.5-3 +- Fixes build system error with conditional logic involving + IPv6addr and updates spec file to build against rhel 7 as + well as fedora 19. + * Mon Mar 11 2013 David Vossel - 3.9.5-2 - Resolves rhbz#915050