From 0f0ffa736951cc57540efee7bdd5387f7ac9ab92 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 30 May 2020 11:59:18 +0200 Subject: [PATCH] - updated to 2.0.3 (new sonames, heartbeat integration removed) - updated manpage_xslt patch - removed outdated automake,libs,heartbeat-libexecdir patches - added inkscape patch (adjust for changed inkscape 1.0 CLI) --- pacemaker-automake.patch | 12 -- pacemaker-heartbeat-libexecdir.patch | 11 -- pacemaker-inkscape.patch | 19 +++ pacemaker-libs.patch | 171 --------------------------- pacemaker-manpage_xslt.patch | 44 +++---- pacemaker.spec | 158 +++++++++++-------------- 6 files changed, 112 insertions(+), 303 deletions(-) delete mode 100644 pacemaker-automake.patch delete mode 100644 pacemaker-heartbeat-libexecdir.patch create mode 100644 pacemaker-inkscape.patch delete mode 100644 pacemaker-libs.patch diff --git a/pacemaker-automake.patch b/pacemaker-automake.patch deleted file mode 100644 index 736ccc1..0000000 --- a/pacemaker-automake.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -dur pacemaker-Pacemaker-1.1.9.orig/configure.ac pacemaker-Pacemaker-1.1.9/configure.ac ---- pacemaker-Pacemaker-1.1.9.orig/configure.ac 2013-03-08 11:48:01.000000000 +0100 -+++ pacemaker-Pacemaker-1.1.9/configure.ac 2013-06-21 20:48:16.759547334 +0200 -@@ -42,7 +42,7 @@ - dnl new defines - dnl - Should not include HAVE_* defines - dnl - Safe to include anywhere --AM_CONFIG_HEADER(include/config.h include/crm_config.h) -+AC_CONFIG_HEADERS(include/config.h include/crm_config.h) - ALL_LINGUAS="en fr" - - AC_ARG_WITH(version, diff --git a/pacemaker-heartbeat-libexecdir.patch b/pacemaker-heartbeat-libexecdir.patch deleted file mode 100644 index 0182dbc..0000000 --- a/pacemaker-heartbeat-libexecdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pacemaker-Pacemaker-1.1.19/configure.ac.orig 2018-09-03 19:49:56.608934960 +0200 -+++ pacemaker-Pacemaker-1.1.19/configure.ac 2018-09-03 19:55:53.318930891 +0200 -@@ -1110,7 +1110,7 @@ - AC_DEFINE_UNQUOTED(CRM_DAEMON_DIR,"$CRM_DAEMON_DIR", Location for Pacemaker daemons) - AC_SUBST(CRM_DAEMON_DIR) - --HB_DAEMON_DIR=`try_extract_header_define $GLUE_HEADER HA_LIBHBDIR $libdir/heartbeat` -+HB_DAEMON_DIR=`try_extract_header_define $GLUE_HEADER GLUE_DAEMON_DIR $libexecdir/heartbeat` - AC_DEFINE_UNQUOTED(HB_DAEMON_DIR,"$HB_DAEMON_DIR", Location Heartbeat expects Pacemaker daemons to be in) - AC_SUBST(HB_DAEMON_DIR) - diff --git a/pacemaker-inkscape.patch b/pacemaker-inkscape.patch new file mode 100644 index 0000000..39f5e64 --- /dev/null +++ b/pacemaker-inkscape.patch @@ -0,0 +1,19 @@ +--- pacemaker-Pacemaker-2.0.3/doc/Makefile.am.orig 2019-11-25 23:54:47.000000000 +0100 ++++ pacemaker-Pacemaker-2.0.3/doc/Makefile.am 2020-05-28 06:15:03.122900431 +0200 +@@ -85,13 +85,13 @@ + graphics: $(PNGS) + + %.png: %.svg +- $(AM_V_GEN)$(INKSCAPE) --file=$< --export-dpi=90 -C --export-png=$@ $(PCMK_quiet) ++ $(AM_V_GEN)$(INKSCAPE) $< --export-dpi=90 -C -o $@ $(PCMK_quiet) + + %-small.png: %.svg +- $(AM_V_GEN)$(INKSCAPE) --file=$< --export-dpi=45 -C --export-png=$@ $(PCMK_quiet) ++ $(AM_V_GEN)$(INKSCAPE) $< --export-dpi=45 -C -o $@ $(PCMK_quiet) + + %-large.png: %.svg +- $(AM_V_GEN)$(INKSCAPE) --file=$< --export-dpi=180 -C --export-png=$@ $(PCMK_quiet) ++ $(AM_V_GEN)$(INKSCAPE) $< --export-dpi=180 -C -o $@ $(PCMK_quiet) + + if IS_ASCIIDOC + ASCIIDOC_HTML_ARGS = --unsafe --backend=xhtml11 diff --git a/pacemaker-libs.patch b/pacemaker-libs.patch deleted file mode 100644 index 78f08e3..0000000 --- a/pacemaker-libs.patch +++ /dev/null @@ -1,171 +0,0 @@ ---- pacemaker-Pacemaker-1.1.22/configure.ac.orig 2020-05-01 18:26:26.206360554 +0200 -+++ pacemaker-Pacemaker-1.1.22/configure.ac 2020-05-01 18:32:45.394306317 +0200 -@@ -807,17 +807,21 @@ - dnl =============================================== - dnl Libraries - dnl =============================================== --AC_CHECK_LIB(socket, socket) dnl -lsocket --AC_CHECK_LIB(c, dlopen) dnl if dlopen is in libc... --AC_CHECK_LIB(dl, dlopen) dnl -ldl (for Linux) --AC_CHECK_LIB(rt, sched_getscheduler) dnl -lrt (for Tru64) --AC_CHECK_LIB(gnugetopt, getopt_long) dnl -lgnugetopt ( if available ) --AC_CHECK_LIB(pam, pam_start) dnl -lpam (if available) -+AC_SEARCH_LIBS(socket, socket) dnl -lsocket -+AC_SEARCH_LIBS(dlopen, [dl]) dnl if dlopen is in libc... or -ldl (for Linux) -+AC_SEARCH_LIBS(sched_getscheduler, [rt]) dnl -lrt (for Tru64) -+AC_SEARCH_LIBS(getopt_long, [gnugetopt]) dnl -lgnugetopt ( if available ) -+AC_CHECK_LIB(pam, pam_start, [LIBPAM=-lpam]) dnl -lpam (if available) -+AC_SUBST([LIBPAM]) - - AC_CHECK_FUNCS([sched_setscheduler]) - --AC_CHECK_LIB(uuid, uuid_parse) dnl load the library if necessary -+AC_CHECK_LIB(uuid, uuid_parse, [LIBUUID=-luuid]) dnl load the library if necessary -+AC_SUBST([LIBUUID]) -+oldLIBS="$LIBS" -+LIBS="$LIBS $LIBUUID" - AC_CHECK_FUNCS(uuid_unparse) dnl OSX ships uuid_* as standard functions -+LIBS="$oldLIBS" - - AC_CHECK_HEADERS(uuid/uuid.h) - -@@ -941,8 +945,10 @@ - else - XML2HEAD="`$XML2CONFIG --cflags`" - AC_MSG_RESULT($XML2HEAD) -- AC_CHECK_LIB(xml2, xmlReadMemory) -- AC_CHECK_LIB(xslt, xsltApplyStylesheet) -+ AC_CHECK_LIB(xml2, xmlReadMemory, [AC_DEFINE([HAVE_LIBXML2], [1], [Have libxml2]) LIBXML2=-lxml2]) -+ AC_CHECK_LIB(xslt, xsltApplyStylesheet, [AC_DEFINE([HAVE_LIBXSLT], [1], [Have libxslt]) LIBXSLT=-lxslt]) -+ AC_SUBST([LIBXML2]) -+ AC_SUBST([LIBXSLT]) - fi - - CPPFLAGS="$CPPFLAGS $XML2HEAD" -@@ -988,7 +994,8 @@ - dnl bzip2 - dnl ======================================================================== - AC_CHECK_HEADERS(bzlib.h) --AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress) -+AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, [LIBBZ2=-lbz2]) -+AC_SUBST([LIBBZ2]) - - if test x$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress != xyes ; then - AC_MSG_ERROR(BZ2 libraries not found) -@@ -1158,7 +1165,6 @@ - - PKG_CHECK_MODULES(libqb, libqb >= 0.13) - CPPFLAGS="$libqb_CFLAGS $CPPFLAGS" --LIBS="$libqb_LIBS $LIBS" - AC_CHECK_HEADERS(qb/qbipc_common.h) - AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set) - -@@ -1193,8 +1199,10 @@ - if test $HAVE_GLUE = 1; then - dnl On Debian, AC_CHECK_LIBS fail if a library has any unresolved symbols - dnl So check for all the dependencies (so they're added to LIBS) before checking for -lplumb -- AC_CHECK_LIB(pils, PILLoadPlugin) -- AC_CHECK_LIB(plumb, G_main_add_IPC_Channel) -+ AC_CHECK_LIB(pils, PILLoadPlugin, [LIBPILS=-lpils]) -+ AC_CHECK_LIB(plumb, G_main_add_IPC_Channel, [LIBPLUMB=-lplumb]) -+ AC_SUBST([LIBPILS]) -+ AC_SUBST([LIBPLUMB]) - fi - - dnl =============================================== -@@ -1776,7 +1784,7 @@ - AC_MSG_RESULT($SUPPORT_ACL) - - SUPPORT_ACL=1 -- AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set) -+ AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set, [:]) - if test $ac_cv_lib_qb_qb_ipcs_connection_auth_set != yes; then - SUPPORT_ACL=0 - fi -@@ -1842,9 +1850,12 @@ - GNUTLSLIBS="`$LIBGNUTLS_CONFIG --libs`"; - AC_MSG_RESULT($GNUTLSLIBS) - fi --AC_CHECK_LIB(gnutls, gnutls_init) -+AC_CHECK_LIB(gnutls, gnutls_init, [GNUTLSLIBS=-lgnutls]) -+oldLIBS="$LIBS" -+LIBS="$LIBS $GNUTLSLIBS" - AC_CHECK_FUNCS(gnutls_priority_set_direct) - AC_CHECK_FUNCS([gnutls_sec_param_to_pk_bits]) dnl since 2.12.0 (2011-03-24) -+LIBS="$oldLIBS" - - AC_SUBST(GNUTLSHEAD) - AC_SUBST(GNUTLSLIBS) ---- pacemaker-Pacemaker-1.1.19/pengine/Makefile.am.orig 2018-09-02 14:24:36.610144333 +0200 -+++ pacemaker-Pacemaker-1.1.19/pengine/Makefile.am 2018-09-02 14:45:59.036796358 +0200 -@@ -66,14 +66,14 @@ - libpengine_la_LDFLAGS += $(LDFLAGS_HARDENED_LIB) - - libpengine_la_LIBADD = $(top_builddir)/lib/pengine/libpe_status.la \ -- $(top_builddir)/lib/cib/libcib.la -+ $(top_builddir)/lib/cib/libcib.la $(LIBXML2) - # -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version - libpengine_la_SOURCES = pengine.c allocate.c notif.c utils.c constraints.c - libpengine_la_SOURCES += native.c group.c clone.c master.c graph.c utilization.c container.c - - pengine_CFLAGS = $(CFLAGS_HARDENED_EXE) - pengine_LDFLAGS = $(LDFLAGS_HARDENED_EXE) --pengine_LDADD = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS) -+pengine_LDADD = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS) $(libqb_LIBS) - # libcib for get_object_root() - # $(top_builddir)/lib/hbclient/libhbclient.la - pengine_SOURCES = main.c ---- pacemaker-Pacemaker-1.1.19/lib/common/Makefile.am.orig 2018-09-02 14:46:36.066795934 +0200 -+++ pacemaker-Pacemaker-1.1.19/lib/common/Makefile.am 2018-09-02 14:48:38.040127875 +0200 -@@ -35,7 +35,7 @@ - libcrmcommon_la_CFLAGS = $(CFLAGS_HARDENED_LIB) - libcrmcommon_la_LDFLAGS += $(LDFLAGS_HARDENED_LIB) - --libcrmcommon_la_LIBADD = @LIBADD_DL@ $(GNUTLSLIBS) -+libcrmcommon_la_LIBADD = @LIBADD_DL@ $(LIBPLUMB) $(GNUTLSLIBS) $(LIBXML2) $(LIBXSLT) $(libqb_LIBS) $(LIBBZ2) $(LIBUUID) -lm - - libcrmcommon_la_SOURCES = compat.c digest.c ipc.c io.c procfs.c utils.c xml.c \ - iso8601.c remote.c mainloop.c logging.c watchdog.c \ ---- pacemaker-Pacemaker-1.1.16/lib/cib/Makefile.am.orig 2017-04-16 07:34:31.132737427 +0200 -+++ pacemaker-Pacemaker-1.1.16/lib/cib/Makefile.am 2017-04-16 07:39:18.802734141 +0200 -@@ -30,7 +30,7 @@ - libcib_la_CFLAGS = $(CFLAGS_HARDENED_LIB) - libcib_la_LDFLAGS += $(LDFLAGS_HARDENED_LIB) - --libcib_la_LIBADD = $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la -+libcib_la_LIBADD = $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la $(GNUTLSLIBS) - - clean-generic: - rm -f *.log *.debug *.xml *~ ---- pacemaker-Pacemaker-1.1.22/lib/pengine/Makefile.am.orig 2020-05-01 18:33:26.394084202 +0200 -+++ pacemaker-Pacemaker-1.1.22/lib/pengine/Makefile.am 2020-05-01 18:38:21.532485300 +0200 -@@ -36,7 +36,7 @@ - libpe_status_la_CFLAGS = $(CFLAGS_HARDENED_LIB) - libpe_status_la_LDFLAGS += $(LDFLAGS_HARDENED_LIB) - --libpe_status_la_LIBADD = @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la -+libpe_status_la_LIBADD = @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la $(LIBXML2) - # Use += rather than backlashed continuation lines for parsing by bumplibs.sh - libpe_status_la_SOURCES = - libpe_status_la_SOURCES += container.c ---- pacemaker-Pacemaker-1.1.22/lib/fencing/Makefile.am.orig 2020-05-01 18:33:26.394084202 +0200 -+++ pacemaker-Pacemaker-1.1.22/lib/fencing/Makefile.am 2020-05-01 18:37:57.309283195 +0200 -@@ -16,6 +16,7 @@ - - libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la - libstonithd_la_LIBADD += $(top_builddir)/lib/services/libcrmservice.la -+libstonithd_la_LIBADD += $(LIBPILS) - - libstonithd_la_SOURCES = st_client.c st_rhcs.c - if BUILD_LHA_SUPPORT ---- pacemaker-Pacemaker-1.1.16/cib/Makefile.am.orig 2017-04-16 07:34:31.236070760 +0200 -+++ pacemaker-Pacemaker-1.1.16/cib/Makefile.am 2017-04-16 07:42:50.786065054 +0200 -@@ -36,7 +36,7 @@ - cib_LDFLAGS = $(LDFLAGS_HARDENED_EXE) - - cib_LDADD = $(top_builddir)/lib/cluster/libcrmcluster.la \ -- $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS) -+ $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS) $(LIBPAM) - - cib_SOURCES = io.c messages.c notify.c \ - callbacks.c main.c remote.c common.c diff --git a/pacemaker-manpage_xslt.patch b/pacemaker-manpage_xslt.patch index 22c8b43..894f44e 100644 --- a/pacemaker-manpage_xslt.patch +++ b/pacemaker-manpage_xslt.patch @@ -1,29 +1,29 @@ ---- pacemaker-Pacemaker-1.1.14/configure.ac.orig 2016-04-09 21:34:06.520699847 +0200 -+++ pacemaker-Pacemaker-1.1.14/configure.ac 2016-04-09 21:49:29.907327769 +0200 -@@ -558,27 +558,7 @@ - PCMK_FEATURES="$PCMK_FEATURES generated-manpages" +--- pacemaker-Pacemaker-2.0.3/configure.ac.orig 2020-05-27 21:20:14.380073396 +0200 ++++ pacemaker-Pacemaker-2.0.3/configure.ac 2020-05-27 21:24:07.088812705 +0200 +@@ -713,27 +713,7 @@ + PCMK_FEATURES="$PCMK_FEATURES generated-manpages" fi -MANPAGE_XSLT="" -if test x"${XSLTPROC}" != x""; then -- AC_MSG_CHECKING(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 | 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 +- AC_MSG_CHECKING(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 | 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 +MANPAGE_XSLT="/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl" AC_MSG_RESULT($MANPAGE_XSLT) diff --git a/pacemaker.spec b/pacemaker.spec index 5fcdb06..4d774a4 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -1,7 +1,6 @@ # # Conditional build: %bcond_without corosync # Corosync stack support -%bcond_without heartbeat # Heartbeat stack support %bcond_without servicelog # ServiceLog support [IBM PPC specific] %bcond_without ipmi # IPMI ServiceLog support [IBM PPC specific] %bcond_without doc # documentation @@ -15,68 +14,59 @@ 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: 1.1.22 +Version: 2.0.3 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: ae655914911680a34faf6b0b5033fc6f +# Source0-md5: 4fee89ca3485f3bf27689ad9bd1670cb Source1: %{name}.tmpfiles Source2: %{name}.init Source3: %{name}.service -Patch0: %{name}-automake.patch +Patch0: %{name}-inkscape.patch Patch1: %{name}-manpage_xslt.patch Patch2: %{name}-update.patch -Patch4: %{name}-libs.patch -Patch5: %{name}-heartbeat-libexecdir.patch URL: http://clusterlabs.org/wiki/Main_Page %{?with_ipmi:BuildRequires: OpenIPMI-devel} BuildRequires: asciidoc -BuildRequires: autoconf >= 2.59 -BuildRequires: automake -BuildRequires: bison +BuildRequires: autoconf >= 2.64 +BuildRequires: automake >= 1:1.11 BuildRequires: bzip2-devel BuildRequires: cluster-glue-libs-devel %{?with_corosync:BuildRequires: corosync-devel >= 2.0} BuildRequires: dbus-devel BuildRequires: docbook-style-xsl -BuildRequires: e2fsprogs-devel -BuildRequires: flex BuildRequires: gettext-tools -BuildRequires: glib2-devel >= 2.0 -BuildRequires: gnutls-devel +BuildRequires: glib2-devel >= 1:2.16.0 +BuildRequires: gnutls-devel >= 2.12.0 BuildRequires: help2man -%{?with_heartbeat:BuildRequires: heartbeat-devel >= 3.0.6} -BuildRequires: libesmtp-devel BuildRequires: libltdl-devel -BuildRequires: libqb-devel >= 0.13 +BuildRequires: libqb-devel >= 0.17.0 %{?with_servicelog:BuildRequires: libservicelog-devel} -BuildRequires: libtool +BuildRequires: libtool >= 2:2 BuildRequires: libuuid-devel BuildRequires: libxml2-devel >= 2.0 BuildRequires: libxslt-devel BuildRequires: libxslt-progs BuildRequires: ncurses-devel >= 5.4 -BuildRequires: net-snmp-devel BuildRequires: pam-devel -BuildRequires: pciutils-devel BuildRequires: pkgconfig -BuildRequires: python-devel +BuildRequires: python-devel >= 1:2.7 BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.644 BuildRequires: systemd-units -BuildRequires: swig %if %{with doc} -BuildRequires: inkscape +BuildRequires: inkscape >= 1.0 BuildRequires: publican %endif Requires: %{name}-libs = %{version}-%{release} Requires: cluster-glue Requires: resource-agents +Suggests: pacemaker-shell Provides: group(haclient) Provides: user(hacluster) -Suggests: pacemaker-shell +Obsoletes: pacemaker-heartbeat < 2.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -107,7 +97,9 @@ Pacemaker był wcześniej częścią pakietu Heartbeat. Summary: Pacemaker libraries Summary(pl.UTF-8): Biblioteki Pacemakera Group: Libraries -Requires: libqb >= 0.13 +Requires: glib2 >= 1:2.16.0 +Requires: gnutls-libs >= 2.12.0 +Requires: libqb >= 0.17.0 %description libs Shared libraries for Pacemaker. @@ -120,6 +112,15 @@ Summary: Header files for Pacemaker libraries Summary(pl.UTF-8): Pliki nagłówkowe bibliotek Pacemakera Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} +Requires: bzip2-devel +Requires: dbus-devel +Requires: glib2-devel >= 1:2.16.0 +Requires: gnutls-devel >= 2.12.0 +Requires: libqb-devel >= 0.17.0 +Requires: libxml2-devel >= 2.0 +Requires: libxslt-devel +Requires: libuuid-devel +Requires: ncurses-devel %description devel Header files for Pacemaker libraries. @@ -157,28 +158,13 @@ na węzłach "wirtualnych" bez zainstalowanego całego stosu klastrowego. Jest to przydatne przy zarządzaniu usługami na maszynach wirtualncych lub w kontenerach uruchomionych na klastrze opartym o Pacemaker. -%package heartbeat -Summary: Pacemaker for Heartbeat cluster -Summary(pl.UTF-8): Pacemaker dla klastra Heartbeat -Group: Applications/System -Requires: %{name} = %{version}-%{release} -Requires: heartbeat >= 3.0.6 -Obsoletes: pacemaker < 1.1 - -%description heartbeat -This package allows using Pacemaker on a Heartbeat cluster. - -%description heartbeat -l pl.UTF-8 -Ten pakiet pozwala na używanie Pacemakera na klastrze Heartbeat. - %package corosync Summary: Pacemaker for Corosync cluster Summary(pl.UTF-8): Pacemaker dla klastra Corosync Group: Applications/System Requires: %{name} = %{version}-%{release} -Requires: corosync +Requires: corosync >= 2.0 Requires: systemd-units >= 38 -%{?with_heartbeat:%requires_eq heartbeat-libs} %description corosync This package allows using Pacemaker on a Corosync cluster. @@ -202,8 +188,6 @@ Dokumentacja do Pacemakera. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch4 -p1 -%patch5 -p1 %build %{__libtoolize} @@ -212,19 +196,16 @@ Dokumentacja do Pacemakera. %{__autoheader} %{__automake} -CPPFLAGS="%{rpmcppflags} %{?with_heartbeat:-I/usr/include/heartbeat}" # enable systemd explicitly to avoid configure checks via dbus-send or systemctl %configure \ + PYTHON=%{__python} \ --disable-fatal-warnings \ --disable-silent-rules \ --enable-systemd \ --disable-upstart \ --with-acl \ --with-corosync%{!?with_corosync:=no} \ - --with-esmtp \ - --with-heartbeat%{!?with_heartbeat:=no} \ - --with-initdir=/etc/rc.d/init.d \ - --with-snmp + --with-initdir=/etc/rc.d/init.d %{__make} @@ -253,7 +234,7 @@ rm -rf $RPM_BUILD_ROOT %pre %groupadd -g 60 haclient -%useradd -u 17 -d /var/lib/heartbeat/cores/hacluster -c "Heartbeat User" -g haclient hacluster +%useradd -u 17 -d /var/lib/pacemaker/cores -c "Heartbeat User" -g haclient hacluster %post corosync /sbin/chkconfig --add %{name} @@ -288,7 +269,7 @@ fi %files %defattr(644,root,root,755) -%doc ChangeLog README.markdown doc/*.html doc/{executioner,msg-schema,security}.txt doc/{openstack,pcs-crmsh-quick-ref}.md +%doc ChangeLog README.markdown doc/*.html doc/security.txt doc/{openstack,pcs-crmsh-quick-ref}.md %attr(755,root,root) %{_sbindir}/attrd_updater %attr(755,root,root) %{_sbindir}/cibadmin %attr(755,root,root) %{_sbindir}/crm_attribute @@ -300,6 +281,7 @@ fi %attr(755,root,root) %{_sbindir}/crm_node %attr(755,root,root) %{_sbindir}/crm_report %attr(755,root,root) %{_sbindir}/crm_resource +%attr(755,root,root) %{_sbindir}/crm_rule %attr(755,root,root) %{_sbindir}/crm_simulate %attr(755,root,root) %{_sbindir}/crm_shadow %attr(755,root,root) %{_sbindir}/crm_standby @@ -307,7 +289,6 @@ fi %attr(755,root,root) %{_sbindir}/crm_verify %attr(755,root,root) %{_sbindir}/crmadmin %attr(755,root,root) %{_sbindir}/fence_legacy -%attr(755,root,root) %{_sbindir}/fence_pcmk %attr(755,root,root) %{_sbindir}/iso8601 %attr(755,root,root) %{_sbindir}/stonith_admin %if %{with servicelog} @@ -321,22 +302,30 @@ fi %attr(755,root,root) %{_libexecdir}/%{name}/cib %attr(755,root,root) %{_libexecdir}/%{name}/cibmon %attr(755,root,root) %{_libexecdir}/%{name}/crmd +%attr(755,root,root) %{_libexecdir}/%{name}/cts-exec-helper +%attr(755,root,root) %{_libexecdir}/%{name}/cts-fence-helper +%attr(755,root,root) %{_libexecdir}/%{name}/cts-log-watcher +%attr(755,root,root) %{_libexecdir}/%{name}/cts-support %attr(755,root,root) %{_libexecdir}/%{name}/lrmd -%attr(755,root,root) %{_libexecdir}/%{name}/lrmd_internal_ctl -%attr(755,root,root) %{_libexecdir}/%{name}/lrmd_test +%attr(755,root,root) %{_libexecdir}/%{name}/pacemaker-attrd +%attr(755,root,root) %{_libexecdir}/%{name}/pacemaker-based +%attr(755,root,root) %{_libexecdir}/%{name}/pacemaker-controld +%attr(755,root,root) %{_libexecdir}/%{name}/pacemaker-execd +%attr(755,root,root) %{_libexecdir}/%{name}/pacemaker-fenced +%attr(755,root,root) %{_libexecdir}/%{name}/pacemaker-schedulerd %attr(755,root,root) %{_libexecdir}/%{name}/pengine -%attr(755,root,root) %{_libexecdir}/%{name}/stonith-test %attr(755,root,root) %{_libexecdir}/%{name}/stonithd %{_datadir}/pacemaker %{_datadir}/mibs/PCMK-MIB.txt -%{py_sitedir}/cts +%{py_sitescriptdir}/cts %{systemdunitdir}/crm_mon.service %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/pacemaker +%attr(750,root,haclient) %dir %{_sysconfdir}/pacemaker %ghost /var/log/pacemaker.log -%{_mandir}/man7/crmd.7* %{_mandir}/man7/ocf_pacemaker_*.7* -%{_mandir}/man7/pengine.7* -%{_mandir}/man7/stonithd.7* +%{_mandir}/man7/pacemaker-controld.7* +%{_mandir}/man7/pacemaker-fenced.7* +%{_mandir}/man7/pacemaker-schedulerd.7* %{_mandir}/man8/attrd_updater.8* %{_mandir}/man8/cibadmin.8* %{_mandir}/man8/crm_attribute.8* @@ -348,6 +337,7 @@ fi %{_mandir}/man8/crm_node.8* %{_mandir}/man8/crm_report.8* %{_mandir}/man8/crm_resource.8* +%{_mandir}/man8/crm_rule.8* %{_mandir}/man8/crm_shadow.8* %{_mandir}/man8/crm_simulate.8* %{_mandir}/man8/crm_standby.8* @@ -355,7 +345,6 @@ fi %{_mandir}/man8/crm_verify.8* %{_mandir}/man8/crmadmin.8* %{_mandir}/man8/fence_legacy.8* -%{_mandir}/man8/fence_pcmk.8* %{_mandir}/man8/iso8601.8* %{_mandir}/man8/stonith_admin.8* %if %{with servicelog} @@ -365,12 +354,11 @@ fi %{_mandir}/man8/notifyServicelogEvent.8* %endif -%dir %{_prefix}/lib/ocf/resource.d/.isolation -%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/.isolation/docker-wrapper %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/Dummy %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/HealthCPU +%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/HealthIOWait %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 @@ -386,32 +374,33 @@ fi %dir /var/lib/%{name} %dir %attr(750,hacluster,haclient) /var/lib/%{name}/blackbox %dir %attr(750,hacluster,haclient) /var/lib/%{name}/cib +%dir %attr(750,hacluster,haclient) /var/lib/%{name}/cores %dir %attr(750,hacluster,haclient) /var/lib/%{name}/pengine +%dir %attr(770,hacluster,haclient) /var/log/%{name} +%dir %attr(770,hacluster,haclient) /var/log/%{name}/bundles %dir %attr(750,hacluster,haclient) %{_var}/run/crm %{systemdtmpfilesdir}/%{name}.conf %files libs %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libcib.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libcib.so.4 +%attr(755,root,root) %ghost %{_libdir}/libcib.so.27 %attr(755,root,root) %{_libdir}/libcrmcluster.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libcrmcluster.so.4 +%attr(755,root,root) %ghost %{_libdir}/libcrmcluster.so.29 %attr(755,root,root) %{_libdir}/libcrmcommon.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libcrmcommon.so.3 +%attr(755,root,root) %ghost %{_libdir}/libcrmcommon.so.34 %attr(755,root,root) %{_libdir}/libcrmservice.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libcrmservice.so.3 +%attr(755,root,root) %ghost %{_libdir}/libcrmservice.so.28 %attr(755,root,root) %{_libdir}/liblrmd.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liblrmd.so.1 +%attr(755,root,root) %ghost %{_libdir}/liblrmd.so.28 +%attr(755,root,root) %{_libdir}/libpacemaker.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libpacemaker.so.1 %attr(755,root,root) %{_libdir}/libpe_rules.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libpe_rules.so.2 +%attr(755,root,root) %ghost %{_libdir}/libpe_rules.so.26 %attr(755,root,root) %{_libdir}/libpe_status.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libpe_status.so.16 -%attr(755,root,root) %{_libdir}/libpengine.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libpengine.so.16 +%attr(755,root,root) %ghost %{_libdir}/libpe_status.so.28 %attr(755,root,root) %{_libdir}/libstonithd.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libstonithd.so.2 -%attr(755,root,root) %{_libdir}/libtransitioner.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libtransitioner.so.2 +%attr(755,root,root) %ghost %{_libdir}/libstonithd.so.26 %files devel %defattr(644,root,root,755) @@ -420,29 +409,30 @@ fi %attr(755,root,root) %{_libdir}/libcrmcommon.so %attr(755,root,root) %{_libdir}/libcrmservice.so %attr(755,root,root) %{_libdir}/liblrmd.so +%attr(755,root,root) %{_libdir}/libpacemaker.so %attr(755,root,root) %{_libdir}/libpe_rules.so %attr(755,root,root) %{_libdir}/libpe_status.so -%attr(755,root,root) %{_libdir}/libpengine.so %attr(755,root,root) %{_libdir}/libstonithd.so -%attr(755,root,root) %{_libdir}/libtransitioner.so %{_libdir}/libcib.la %{_libdir}/libcrmcluster.la %{_libdir}/libcrmcommon.la %{_libdir}/libcrmservice.la %{_libdir}/liblrmd.la +%{_libdir}/libpacemaker.la %{_libdir}/libpe_rules.la %{_libdir}/libpe_status.la -%{_libdir}/libpengine.la %{_libdir}/libstonithd.la -%{_libdir}/libtransitioner.la %{_includedir}/pacemaker +%{_pkgconfigdir}/libpacemaker.pc %{_pkgconfigdir}/pacemaker.pc %{_pkgconfigdir}/pacemaker-cib.pc %{_pkgconfigdir}/pacemaker-cluster.pc %{_pkgconfigdir}/pacemaker-fencing.pc %{_pkgconfigdir}/pacemaker-lrmd.pc -%{_pkgconfigdir}/pacemaker-pengine.pc +%{_pkgconfigdir}/pacemaker-pe_rules.pc +%{_pkgconfigdir}/pacemaker-pe_status.pc %{_pkgconfigdir}/pacemaker-service.pc +%{_npkgconfigdir}/pacemaker-schemas.pc %files static %defattr(644,root,root,755) @@ -451,25 +441,18 @@ fi %{_libdir}/libcrmcommon.a %{_libdir}/libcrmservice.a %{_libdir}/liblrmd.a +%{_libdir}/libpacemaker.a %{_libdir}/libpe_rules.a %{_libdir}/libpe_status.a -%{_libdir}/libpengine.a %{_libdir}/libstonithd.a -%{_libdir}/libtransitioner.a %files remote %defattr(644,root,root,755) +%attr(755,root,root) %{_sbindir}/pacemaker-remoted %attr(755,root,root) %{_sbindir}/pacemaker_remoted %attr(755,root,root) /etc/rc.d/init.d/pacemaker_remote %{systemdunitdir}/pacemaker_remote.service -%{_mandir}/man8/pacemaker_remoted.8* - -%if %{with heartbeat} -%files heartbeat -%defattr(644,root,root,755) -%attr(755,root,root) %{_sbindir}/crm_uuid -%{_mandir}/man8/crm_uuid.8* -%endif +%{_mandir}/man8/pacemaker-remoted.8* %if %{with corosync} %files corosync @@ -485,6 +468,7 @@ fi %defattr(644,root,root,755) %dir %{_docdir}/pacemaker %{_docdir}/pacemaker/Clusters_from_Scratch +%{_docdir}/pacemaker/Pacemaker_Administration %{_docdir}/pacemaker/Pacemaker_Development %{_docdir}/pacemaker/Pacemaker_Explained %{_docdir}/pacemaker/Pacemaker_Remote -- 2.44.0