---- pacemaker-Pacemaker-2.1.2/lib/pengine/Makefile.am.orig 2021-11-24 16:54:28.000000000 +0100
-+++ pacemaker-Pacemaker-2.1.2/lib/pengine/Makefile.am 2022-02-07 20:36:18.101808130 +0100
-@@ -29,7 +29,7 @@ libpe_status_la_LDFLAGS = -version-info
+--- pacemaker-Pacemaker-2.1.5/lib/pengine/Makefile.am.orig 2022-12-08 16:47:31.000000000 +0100
++++ pacemaker-Pacemaker-2.1.5/lib/pengine/Makefile.am 2023-03-03 22:39:16.173220067 +0100
+@@ -34,7 +34,7 @@ libpe_status_la_LDFLAGS = -version-info
libpe_status_la_CFLAGS = $(CFLAGS_HARDENED_LIB)
libpe_status_la_LDFLAGS += $(LDFLAGS_HARDENED_LIB)
# Use += rather than backlashed continuation lines for parsing by bumplibs
libpe_status_la_SOURCES =
libpe_status_la_SOURCES += bundle.c
-@@ -48,5 +48,8 @@ libpe_status_la_SOURCES += unpack.c
- libpe_status_la_SOURCES += utils.c
- libpe_status_la_SOURCES += pe_output.c
+@@ -77,5 +77,8 @@ libpe_status_test_la_CFLAGS = $(libpe_st
+ -fno-builtin -fno-inline
+ libpe_status_test_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon_test.la -lcmocka -lm
+$(top_builddir)/lib/cib/libcib.la : libpe_rules.la
+ $(MAKE) -C $(top_builddir)/lib/cib
---- pacemaker-Pacemaker-2.1.2/configure.ac.orig 2022-02-07 20:17:17.317988287 +0100
-+++ pacemaker-Pacemaker-2.1.2/configure.ac 2022-02-07 20:19:04.630740257 +0100
-@@ -873,28 +873,7 @@ if test x"${HELP2MAN}" != x""; then
- PCMK_FEATURES="$PCMK_FEATURES generated-manpages"
- fi
+--- pacemaker-Pacemaker-2.1.5/configure.ac.orig 2023-03-03 22:39:47.226385171 +0100
++++ pacemaker-Pacemaker-2.1.5/configure.ac 2023-03-03 22:42:42.585435169 +0100
+@@ -828,31 +828,7 @@ AM_CONDITIONAL(BUILD_HELP, test x"${HELP
+ AS_IF([test x"${HELP2MAN}" != x""],
+ [PCMK_FEATURES="$PCMK_FEATURES generated-manpages"])
-MANPAGE_XSLT=""
--if test x"${XSLTPROC}" != x""; then
-- AC_MSG_CHECKING([for DocBook-to-manpage transform])
-- # first try to figure out correct template using xmlcatalog query,
-- # resort to extensive (semi-deterministic) file search if that fails
-- DOCBOOK_XSL_URI='http://docbook.sourceforge.net/release/xsl/current'
-- DOCBOOK_XSL_PATH='manpages/docbook.xsl'
-- MANPAGE_XSLT=$(${XMLCATALOG} "" ${DOCBOOK_XSL_URI}/${DOCBOOK_XSL_PATH} \
-- | sed -n 's|^file://||p;q')
-- if test x"${MANPAGE_XSLT}" = x""; then
-- DIRS=$(find "${datadir}" -name $(basename $(dirname ${DOCBOOK_XSL_PATH})) \
-- -type d 2>/dev/null | LC_ALL=C sort)
-- XSLT=$(basename ${DOCBOOK_XSL_PATH})
-- for d in ${DIRS}
-- do
-- if test -f "${d}/${XSLT}"; then
-- MANPAGE_XSLT="${d}/${XSLT}"
-- break
-- fi
-- done
-- fi
--fi
+-AS_IF([test x"${XSLTPROC}" != x""],
+- [
+- AC_MSG_CHECKING([for DocBook-to-manpage transform])
+- # first try to figure out correct template using xmlcatalog query,
+- # resort to extensive (semi-deterministic) file search if that fails
+- DOCBOOK_XSL_URI='http://docbook.sourceforge.net/release/xsl/current'
+- DOCBOOK_XSL_PATH='manpages/docbook.xsl'
+- MANPAGE_XSLT=$(${XMLCATALOG} "" ${DOCBOOK_XSL_URI}/${DOCBOOK_XSL_PATH} \
+- | sed -n 's|^file://||p;q')
+- AS_IF([test x"${MANPAGE_XSLT}" = x""],
+- [
+- DIRS=$(find "${datadir}" -name $(basename $(dirname ${DOCBOOK_XSL_PATH})) \
+- -type d 2>/dev/null | LC_ALL=C sort)
+- XSLT=$(basename ${DOCBOOK_XSL_PATH})
+- for d in ${DIRS}
+- do
+- AS_IF([test -f "${d}/${XSLT}"],
+- [
+- MANPAGE_XSLT="${d}/${XSLT}"
+- break
+- ])
+- done
+- ])
+- ])
+MANPAGE_XSLT="/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
AC_MSG_RESULT([$MANPAGE_XSLT])
AC_SUBST(MANPAGE_XSLT)
+++ /dev/null
---- pacemaker-Pacemaker-1.1.10/tools/notifyServicelogEvent.c.orig 2013-07-26 02:02:31.000000000 +0200
-+++ pacemaker-Pacemaker-1.1.10/tools/notifyServicelogEvent.c 2013-09-07 22:08:44.162036132 +0200
-@@ -31,13 +31,13 @@
- #include <crm/common/util.h>
- #include <crm_internal.h>
-
--typedef enum { STATUS_GREEN = 1, STATUS_YELLOW, STATUS_RED } STATUS;
-+typedef enum { STATUS_GREEN = 1, STATUS_YELLOW, STATUS_RED } STATUS_T;
-
--const char *status2char(STATUS status);
--STATUS event2status(struct sl_event *event);
-+const char *status2char(STATUS_T status);
-+STATUS_T event2status(struct sl_event *event);
-
- const char *
--status2char(STATUS status)
-+status2char(STATUS_T status)
- {
- switch (status) {
- default:
-@@ -50,10 +50,10 @@
- }
- }
-
--STATUS
-+STATUS_T
- event2status(struct sl_event * event)
- {
-- STATUS status = STATUS_GREEN;
-+ STATUS_T status = STATUS_GREEN;
-
- crm_debug("Severity = %d, Disposition = %d", event->severity, event->disposition);
-
-@@ -153,7 +153,7 @@
- }
-
- if (rc == 0) {
-- STATUS status = STATUS_GREEN;
-+ STATUS_T status = STATUS_GREEN;
- const char *health_component = "#health-ipmi";
- const char *health_status = NULL;
-
#
# Conditional build:
%bcond_without corosync # Corosync stack support
-%bcond_without servicelog # ServiceLog support [IBM PPC specific]
-%bcond_without ipmi # IPMI ServiceLog support [IBM PPC specific]
%bcond_without doc # documentation
#
-%ifnarch ppc ppc64
-%undefine with_servicelog
-%endif
-%if %{without servicelog}
-%undefine with_ipmi
-%endif
Summary: The scalable High-Availability cluster resource manager
Summary(pl.UTF-8): Skalowalny zarządca zasobów klastrów o wysokiej dostępności
Name: pacemaker
-Version: 2.1.2
+Version: 2.1.5
Release: 1
License: GPL v2+, LGPL v2.1+
Group: Applications/System
#Source0Download: https://github.com/ClusterLabs/pacemaker/releases
Source0: https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-%{version}.tar.gz
-# Source0-md5: 544c832d5e3d136f74822d89f31f8110
+# Source0-md5: cc945efffb080144fd7411163e2d8d6c
Source1: %{name}.tmpfiles
Source2: %{name}.init
Source3: %{name}.service
Patch0: %{name}-link.patch
Patch1: %{name}-manpage_xslt.patch
-Patch2: %{name}-update.patch
URL: https://wiki.clusterlabs.org/wiki/Pacemaker
-%{?with_ipmi:BuildRequires: OpenIPMI-devel}
BuildRequires: asciidoc
BuildRequires: autoconf >= 2.64
BuildRequires: automake >= 1:1.11
%{?with_corosync:BuildRequires: corosync-devel >= 2.0}
BuildRequires: dbus-devel
BuildRequires: docbook-style-xsl
-BuildRequires: gettext-tools
+BuildRequires: gettext-tools >= 0.18
BuildRequires: glib2-devel >= 1:2.32.0
BuildRequires: gnutls-devel >= 2.12.0
BuildRequires: help2man
BuildRequires: libltdl-devel
BuildRequires: libqb-devel >= 0.17.0
-%{?with_servicelog:BuildRequires: libservicelog-devel}
BuildRequires: libtool >= 2:2
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel >= 2.0
BuildRequires: python3-devel >= 1:3.2
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.644
+BuildRequires: sed >= 4.0
BuildRequires: systemd-units
%if %{with doc}
BuildRequires: inkscape >= 1.0
%setup -qn pacemaker-Pacemaker-%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
+
+%{__sed} -i -e '/po\/Makefile\.in/d' configure.ac
%build
+install -d libltdl/config
+%{__gettextize}
%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
%attr(755,root,root) %{_sbindir}/fence_watchdog
%attr(755,root,root) %{_sbindir}/iso8601
%attr(755,root,root) %{_sbindir}/stonith_admin
-%if %{with servicelog}
-%if %{with ipmi}
-%attr(755,root,root) %{_sbindir}/ipmiservicelogd
-%endif
-%attr(755,root,root) %{_sbindir}/notifyServicelogEvent
-%endif
%dir %{_libexecdir}/%{name}
%attr(755,root,root) %{_libexecdir}/%{name}/cts-exec-helper
%attr(755,root,root) %{_libexecdir}/%{name}/cts-fence-helper
%{_mandir}/man8/fence_watchdog.8*
%{_mandir}/man8/iso8601.8*
%{_mandir}/man8/stonith_admin.8*
-%if %{with servicelog}
-%if %{with ipmi}
-%{_mandir}/man8/ipmiservicelogd.8*
-%endif
-%{_mandir}/man8/notifyServicelogEvent.8*
-%endif
%dir %{_prefix}/lib/ocf/resource.d/pacemaker
%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/ClusterMon
%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/HealthSMART
%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/Stateful
%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/SysInfo
-%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/SystemHealth
%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/attribute
%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/controld
%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/ifspeed
projects / packages / pacemaker.git / commitdiff