New upstream release
This commit is contained in:
David Vossel
parent
d7c2bc2f48
commit
8f82f70bb7
1
.gitignore
vendored
1
.gitignore
vendored
@ -9,3 +9,4 @@ resource-agents-3.0.14.tar.bz2
|
||||
/1.0.4.tar.bz2
|
||||
/resource-agents-3.9.1.tar.bz2
|
||||
/resource-agents-3.9.2.tar.bz2
|
||||
/resource-agents-3.9.5.tar.gz
|
||||
|
||||
@ -1,44 +1,13 @@
|
||||
--- resource-agents-3.9.2/doc/Makefile.in.no-glue 2012-10-29 17:56:50.754473189 -0500
|
||||
+++ resource-agents-3.9.2/doc/Makefile.in 2012-10-29 17:57:05.233313075 -0500
|
||||
@@ -54,7 +54,7 @@ PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
-@BUILD_DOC_TRUE@@USE_IPV6ADDR_TRUE@am__append_1 = ocf_heartbeat_IPv6addr.7
|
||||
+#@BUILD_DOC_TRUE@@USE_IPV6ADDR_TRUE@am__append_1 = ocf_heartbeat_IPv6addr.7
|
||||
subdir = doc
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
@@ -579,8 +579,8 @@ XSLTPROC_FO_OPTIONS ?= $(XSLTPROC_OPTIO
|
||||
metadata-%.xml: $(radir)/%
|
||||
OCF_ROOT=. OCF_FUNCTIONS_DIR=$(radir) $< meta-data > $@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index fa417ee..be888af 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -705,7 +705,7 @@ AM_CONDITIONAL(USE_LIBNET, test "x$libnet_version" != "xnone" )
|
||||
dnl ************************************************************************
|
||||
dnl * Check for netinet/icmp6.h to enable the IPv6addr resource agent
|
||||
AC_CHECK_HEADERS(netinet/icmp6.h,[],[],[#include <sys/types.h>])
|
||||
-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)
|
||||
|
||||
-metadata-IPv6addr.xml: ../heartbeat/IPv6addr
|
||||
- OCF_ROOT=. OCF_FUNCTIONS_DIR=$(radir) $< meta-data > $@
|
||||
+#metadata-IPv6addr.xml: ../heartbeat/IPv6addr
|
||||
+# OCF_ROOT=. OCF_FUNCTIONS_DIR=$(radir) $< meta-data > $@
|
||||
|
||||
@BUILD_DOC_TRUE@%.1 %.5 %.7 %.8: %.xml
|
||||
@BUILD_DOC_TRUE@ $(XSLTPROC) \
|
||||
--- resource-agents-3.9.2/heartbeat/Makefile.in.no-glue 2011-06-30 02:27:34.000000000 -0500
|
||||
+++ resource-agents-3.9.2/heartbeat/Makefile.in 2012-10-29 17:55:59.133041412 -0500
|
||||
@@ -36,7 +36,7 @@ PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
-@USE_IPV6ADDR_TRUE@ocf_PROGRAMS = IPv6addr$(EXEEXT)
|
||||
+#@USE_IPV6ADDR_TRUE@ocf_PROGRAMS = IPv6addr$(EXEEXT)
|
||||
subdir = heartbeat
|
||||
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
$(srcdir)/ocf-binaries.in $(srcdir)/ocf-directories.in \
|
||||
--- resource-agents-3.9.2/heartbeat/Makefile.am.no-glue 2011-06-22 04:46:47.000000000 -0500
|
||||
+++ resource-agents-3.9.2/heartbeat/Makefile.am 2012-10-29 17:55:59.133041412 -0500
|
||||
@@ -31,7 +31,7 @@ dtddir = $(datadir)/$(PACKAGE_NAME)
|
||||
dtd_DATA = ra-api-1.dtd
|
||||
|
||||
if USE_IPV6ADDR
|
||||
-ocf_PROGRAMS = IPv6addr
|
||||
+ocf_PROGRAMS =
|
||||
else
|
||||
ocf_PROGRAMS =
|
||||
endif
|
||||
dnl ========================================================================
|
||||
dnl Compiler flags
|
||||
|
||||
@ -32,8 +32,8 @@
|
||||
|
||||
Name: resource-agents
|
||||
Summary: Open Source HA Reusable Cluster Resource Scripts
|
||||
Version: 3.9.2
|
||||
Release: 5%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
Version: 3.9.5
|
||||
Release: 1%{?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}
|
||||
@ -41,7 +41,7 @@ Group: System Environment/Base
|
||||
%else
|
||||
Group: Productivity/Clustering/HA
|
||||
%endif
|
||||
Source0: %{name}-%{version}%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}.tar.bz2
|
||||
Source0: %{name}-%{version}%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}.tar.gz
|
||||
Patch0: no-cluster-glue.patch
|
||||
Obsoletes: heartbeat-resources <= %{version}
|
||||
Provides: heartbeat-resources = %{version}
|
||||
@ -117,6 +117,9 @@ Group: Productivity/Clustering/HA
|
||||
%endif
|
||||
Obsoletes: heartbeat-ldirectord <= %{version}
|
||||
Provides: heartbeat-ldirectord = %{version}
|
||||
%if 0%{?fedora} > 18
|
||||
BuildRequires: perl-podlators
|
||||
%endif
|
||||
Requires: %{SSLeay} perl-libwww-perl perl-MailTools
|
||||
Requires: ipvsadm logrotate
|
||||
%if 0%{?fedora_version}
|
||||
@ -143,7 +146,7 @@ See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
|
||||
exit 1
|
||||
%endif
|
||||
%setup -q -n %{name}-%{version}%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
|
||||
%patch0 -p1 -b .no-glue
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
if [ ! -f configure ]; then
|
||||
@ -280,7 +283,9 @@ ccs_update_schema > /dev/null 2>&1 ||:
|
||||
%post -n ldirectord
|
||||
/sbin/chkconfig --add ldirectord
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with linuxha}
|
||||
%files -n ldirectord
|
||||
%defattr(-,root,root)
|
||||
%{_sbindir}/ldirectord
|
||||
@ -300,7 +305,11 @@ ccs_update_schema > /dev/null 2>&1 ||:
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jan 25 2013 Kevin Fenzi <kevin@scrye.com> 3.9.2-5
|
||||
|
||||
* Mon Mar 11 2013 David Vossel <dvossel@redhat.com> - 3.9.5-1
|
||||
- New upstream release.
|
||||
|
||||
* Fri Jan 25 2013 Kevin Fenzi <kevin@scrye.com> - 3.9.2-5
|
||||
- Fix cifs mount requires
|
||||
|
||||
* Mon Nov 12 2012 Chris Feist <cfeist@redhat.com> - 3.9.2-4
|
||||
|
||||
Loading…
Reference in New Issue
Block a user