- updated to 1.1.22 (new sonames)

- updated libs,update patches
- removed obsolete man patch

diff --git a/pacemaker-libs.patch b/pacemaker-libs.patch
index 76554a17abe153dd57517e75cb3c632ee5b99ed4..78f08e3b579e2d3add68f89fa49702d226038e70 100644 (file)
--- a/pacemaker-libs.patch
+++ b/pacemaker-libs.patch
@@ -1,6 +1,6 @@
---- pacemaker-Pacemaker-1.1.15/configure.ac.orig       2016-10-16 18:23:45.477084475 +0200
-+++ pacemaker-Pacemaker-1.1.15/configure.ac    2016-10-16 18:28:32.400414530 +0200
-@@ -655,17 +655,21 @@
+--- 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 ===============================================
@@ -29,7 +29,7 @@
  
  AC_CHECK_HEADERS(uuid/uuid.h)
  
-@@ -813,8 +817,10 @@
+@@ -941,8 +945,10 @@
  else
     XML2HEAD="`$XML2CONFIG --cflags`"
     AC_MSG_RESULT($XML2HEAD)
@@ -42,7 +42,7 @@
  fi
  
  CPPFLAGS="$CPPFLAGS $XML2HEAD"
-@@ -882,7 +888,8 @@
+@@ -988,7 +994,8 @@
  dnl   bzip2
  dnl ========================================================================
  AC_CHECK_HEADERS(bzlib.h)
@@ -52,15 +52,15 @@
  
  if test x$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress != xyes ; then
     AC_MSG_ERROR(BZ2 libraries not found)
-@@ -1052,7 +1059,6 @@
+@@ -1158,7 +1165,6 @@
  
- PKG_CHECK_MODULES(libqb, libqb >= 0.13, HAVE_libqb=1)
+ 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)
  
-@@ -1086,8 +1092,10 @@
+@@ -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
@@ -73,7 +73,7 @@
  fi
  
  dnl ===============================================
-@@ -1599,7 +1607,7 @@
+@@ -1776,7 +1784,7 @@
      AC_MSG_RESULT($SUPPORT_ACL)
  
      SUPPORT_ACL=1
@@ -82,7 +82,7 @@
      if test $ac_cv_lib_qb_qb_ipcs_connection_auth_set != yes; then
          SUPPORT_ACL=0
      fi
-@@ -1665,8 +1673,11 @@
+@@ -1842,9 +1850,12 @@
        GNUTLSLIBS="`$LIBGNUTLS_CONFIG --libs`";
        AC_MSG_RESULT($GNUTLSLIBS)
  fi
@@ -91,6 +91,7 @@
 +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)
@@ -136,25 +137,24 @@
  
  clean-generic:
        rm -f *.log *.debug *.xml *~
---- pacemaker-Pacemaker-1.1.19/lib/pengine/Makefile.am.orig    2018-09-02 14:49:08.336794196 +0200
-+++ pacemaker-Pacemaker-1.1.19/lib/pengine/Makefile.am 2018-09-02 15:23:34.093437276 +0200
+--- 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)
- libpe_status_la_SOURCES       = status.c unpack.c utils.c complex.c native.c container.c \
-                       group.c clone.c rules.c common.c failcounts.c remote.c
- 
---- pacemaker-Pacemaker-1.1.19/lib/fencing/Makefile.am.orig    2018-09-02 14:49:08.340127529 +0200
-+++ pacemaker-Pacemaker-1.1.19/lib/fencing/Makefile.am 2018-09-02 15:24:03.616770271 +0200
-@@ -14,7 +14,7 @@
- libstonithd_la_CFLAGS = $(CFLAGS_HARDENED_LIB)
- libstonithd_la_LDFLAGS        += $(LDFLAGS_HARDENED_LIB)
- 
--libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
-+libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la $(LIBPILS)
+ # 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

diff --git a/pacemaker-man.patch b/pacemaker-man.patch
deleted file mode 100644 (file)
index de090a1..0000000
--- a/pacemaker-man.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pacemaker-Pacemaker-1.1.13/Makefile.common.orig    2015-06-24 03:09:28.000000000 +0200
-+++ pacemaker-Pacemaker-1.1.13/Makefile.common 2015-12-19 09:37:15.966689989 +0100
-@@ -33,7 +33,7 @@
-                         -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
- 
- if BUILD_HELP
--man8_MANS             = $(sbin_PROGRAMS:%=%.8) $(sbin_SCRIPTS:%=%.8)
-+man8_MANS             = $(filter-out ipmiservicelogd.8, $(sbin_PROGRAMS:%=%.8) $(sbin_SCRIPTS:%=%.8))
- endif
- 
- %.8:  % $(MAN8DEPS)

diff --git a/pacemaker-update.patch b/pacemaker-update.patch
index e0c4a8b60ce12c1a58565eefdbf39b17dd2752e4..9c62ff67fba6dfd3c99c6524862f216ee391f656 100644 (file)
--- a/pacemaker-update.patch
+++ b/pacemaker-update.patch
@@ -1,13 +1,5 @@
 --- 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
-@@ -27,6 +27,7 @@
- #include <syslog.h>
- #include <unistd.h>
- #include <config.h>
-+#include <crm/attrd.h>
- #include <crm/common/xml.h>
- #include <crm/common/util.h>
- #include <crm_internal.h>
 @@ -31,13 +31,13 @@
  #include <crm/common/util.h>
  #include <crm_internal.h>
@@ -39,15 +31,6 @@
  
      crm_debug("Severity = %d, Disposition = %d", event->severity, event->disposition);
  
-@@ -91,7 +91,7 @@
-     struct sl_event *event = NULL;
-     uint64_t event_id = 0;
- 
--    crm_log_init_quiet("notifyServicelogEvent", LOG_INFO, FALSE, TRUE, argc, argv);
-+    crm_log_init("notifyServicelogEvent", LOG_INFO, FALSE, TRUE, argc, argv, TRUE);
-     crm_set_options(NULL, "event_id ", long_options,
-                     "Gets called upon events written to servicelog database");
- 
 @@ -153,7 +153,7 @@
      }
  
@@ -57,14 +40,3 @@
          const char *health_component = "#health-ipmi";
          const char *health_status = NULL;
  
---- pacemaker-Pacemaker-1.1.10/tools/ipmiservicelogd.c.orig    2013-07-26 02:02:31.000000000 +0200
-+++ pacemaker-Pacemaker-1.1.10/tools/ipmiservicelogd.c 2013-09-07 22:09:35.002033998 +0200
-@@ -565,7 +565,7 @@
- 
-     crm_make_daemon("ipmiservicelogd", TRUE, "/var/run/ipmiservicelogd.pid0");
- 
--    crm_log_init("ipmiservicelogd", LOG_INFO, FALSE, TRUE, argc, argv);
-+    crm_log_init("ipmiservicelogd", LOG_INFO, FALSE, TRUE, argc, argv, FALSE);
- 
- #ifdef COMPLEX
-     rv = ipmi_args_setup_con(args, os_hnd, NULL, &con);

diff --git a/pacemaker.spec b/pacemaker.spec
index 0971ffe771f305f5f41a728294567e19675738ee..5fcdb067cbf5f42213a334016c6a0d16cd5f6226 100644 (file)
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -1,10 +1,10 @@
-# TODO: publican docs (BR: publican, inkscape)
 #
 # 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
 #
 %ifnarch ppc ppc64
 %undefine      with_servicelog
@@ -15,20 +15,19 @@
 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.19
-Release:       3
+Version:       1.1.22
+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: 335dab2fd6b3a284a6bd2bbeef60c960
+# Source0-md5: ae655914911680a34faf6b0b5033fc6f
 Source1:       %{name}.tmpfiles
 Source2:       %{name}.init
 Source3:       %{name}.service
 Patch0:                %{name}-automake.patch
 Patch1:                %{name}-manpage_xslt.patch
 Patch2:                %{name}-update.patch
-Patch3:                %{name}-man.patch
 Patch4:                %{name}-libs.patch
 Patch5:                %{name}-heartbeat-libexecdir.patch
 URL:           http://clusterlabs.org/wiki/Main_Page
@@ -68,6 +67,10 @@ BuildRequires:       rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.644
 BuildRequires: systemd-units
 BuildRequires: swig
+%if %{with doc}
+BuildRequires: inkscape
+BuildRequires: publican
+%endif
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      cluster-glue
 Requires:      resource-agents
@@ -136,6 +139,24 @@ Static Pacemaker libraries.
 %description static -l pl.UTF-8
 Statyczne biblioteki Pacemakera.
 
+%package remote
+Summary:       Remote services manager for Pacemaker
+Summary(pl.UTF-8):     Zarządca usług zdalnych dla Pacemakera
+Group:         Applications/System
+Requires:      systemd-units >= 38
+Requires:      %{name} = %{version}-%{release}
+
+%description remote
+This package allows running Pacemaker-managed services on 'virtual'
+nodes without actual cluster stack. This is useful to manage services
+in virtual machines or containers running on a Pacemaker cluster.
+
+%description remote -l pl.UTF-8
+Ten pakiet pozwala na uruchamianie usług zarządzanych przez Pacemakera
+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
@@ -165,30 +186,22 @@ This package allows using Pacemaker on a Corosync cluster.
 %description corosync -l pl.UTF-8
 Ten pakiet pozwala na używanie Pacemakera na klastrze Corosync.
 
-%package remote
-Summary:       Remote services manager for Pacemaker
-Summary(pl.UTF-8):     Zarządca usług zdalnych dla Pacemakera
-Group:         Applications/System
-Requires:      systemd-units >= 38
-Requires:      %{name} = %{version}-%{release}
+%package doc
+Summary:       Pacemaker documentation
+Summary(pl.UTF-8):     Dokumentacja do Pacemakera
+Group:         Documentation
 
-%description remote
-This package allows running Pacemaker-managed services on 'virtual'
-nodes without actual cluster stack. This is useful to manage services
-in virtual machines or containers running on a Pacemaker cluster.
+%description doc
+Pacemaker documentation.
 
-%description remote -l pl.UTF-8
-Ten pakiet pozwala na uruchamianie usług zarządzanych przez Pacemakera
-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.
+%description doc -l pl.UTF-8
+Dokumentacja do Pacemakera.
 
 %prep
 %setup -qn pacemaker-Pacemaker-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 
@@ -225,9 +238,11 @@ install -d $RPM_BUILD_ROOT{/var/run/crm,/var/log}
 
 touch $RPM_BUILD_ROOT/var/log/pacemaker.log
 
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/pacemaker
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/pacemaker/tests
+# package as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/pacemaker/{COPYING,README.markdown,acls.*,crm_fencing.*,licenses}
 
-install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 %if %{with corosync}
 install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install -D %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
@@ -344,6 +359,9 @@ fi
 %{_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
 
@@ -370,7 +388,7 @@ fi
 %dir %attr(750,hacluster,haclient) /var/lib/%{name}/cib
 %dir %attr(750,hacluster,haclient) /var/lib/%{name}/pengine
 %dir %attr(750,hacluster,haclient) %{_var}/run/crm
-/usr/lib/tmpfiles.d/%{name}.conf
+%{systemdtmpfilesdir}/%{name}.conf
 
 %files libs
 %defattr(644,root,root,755)
@@ -387,9 +405,9 @@ fi
 %attr(755,root,root) %{_libdir}/libpe_rules.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libpe_rules.so.2
 %attr(755,root,root) %{_libdir}/libpe_status.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpe_status.so.10
+%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.10
+%attr(755,root,root) %ghost %{_libdir}/libpengine.so.16
 %attr(755,root,root) %{_libdir}/libstonithd.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libstonithd.so.2
 %attr(755,root,root) %{_libdir}/libtransitioner.so.*.*.*
@@ -461,3 +479,13 @@ fi
 %{systemdunitdir}/%{name}.service
 %{_mandir}/man8/pacemakerd.8*
 %endif
+
+%if %{with doc}
+%files doc
+%defattr(644,root,root,755)
+%dir %{_docdir}/pacemaker
+%{_docdir}/pacemaker/Clusters_from_Scratch
+%{_docdir}/pacemaker/Pacemaker_Development
+%{_docdir}/pacemaker/Pacemaker_Explained
+%{_docdir}/pacemaker/Pacemaker_Remote
+%endif