- updated to 1.1.15

- updated libs patch

diff --git a/pacemaker-libs.patch b/pacemaker-libs.patch
index 737f997a7a59c8c3403c474c4054b8e83591a7f7..8842b8de3dc3d05c3b43768defb32beaabf9591d 100644 (file)
--- a/pacemaker-libs.patch
+++ b/pacemaker-libs.patch
@@ -1,6 +1,6 @@
---- pacemaker-Pacemaker-1.1.14/configure.ac.orig       2016-04-09 21:49:56.760659968 +0200
-+++ pacemaker-Pacemaker-1.1.14/configure.ac    2016-04-09 22:00:07.427301010 +0200
-@@ -619,17 +619,21 @@
+--- 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 @@
  dnl ===============================================
  dnl Libraries
  dnl ===============================================
@@ -29,7 +29,7 @@
  
  AC_CHECK_HEADERS(uuid/uuid.h)
  
-@@ -777,8 +781,10 @@
+@@ -813,8 +817,10 @@
  else
     XML2HEAD="`$XML2CONFIG --cflags`"
     AC_MSG_RESULT($XML2HEAD)
@@ -42,7 +42,7 @@
  fi
  
  CPPFLAGS="$CPPFLAGS $XML2HEAD"
-@@ -846,7 +852,8 @@
+@@ -882,7 +888,8 @@
  dnl   bzip2
  dnl ========================================================================
  AC_CHECK_HEADERS(bzlib.h)
@@ -52,18 +52,18 @@
  
  if test x$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress != xyes ; then
     AC_MSG_ERROR(BZ2 libraries not found)
-@@ -1023,7 +1030,6 @@
+@@ -1052,7 +1059,6 @@
  
- AC_CHECK_FUNCS(qb_ipcs_connection_get_buffer_size, AC_DEFINE(HAVE_IPCS_GET_BUFFER_SIZE,  1, [Have qb_ipcc_get_buffer_size function]))
+ PKG_CHECK_MODULES(libqb, libqb >= 0.13, HAVE_libqb=1)
+ CPPFLAGS="$libqb_CFLAGS $CPPFLAGS"
+-LIBS="$libqb_LIBS $LIBS"
+ AC_CHECK_HEADERS(qb/qbipc_common.h)
+ AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set)
  
--LIBS="$LIBS $libqb_LIBS"
- 
- AC_CHECK_HEADERS(heartbeat/hb_config.h)
- AC_CHECK_HEADERS(heartbeat/glue_config.h)
-@@ -1050,8 +1056,10 @@
+@@ -1086,8 +1092,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 depenancies (so they're added to LIBS) before checking for -lplumb
+    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])
@@ -73,7 +73,7 @@
  fi
  
  dnl ===============================================
-@@ -1563,7 +1571,7 @@
+@@ -1599,7 +1607,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
-@@ -1629,8 +1637,11 @@
+@@ -1665,8 +1673,11 @@
        GNUTLSLIBS="`$LIBGNUTLS_CONFIG --libs`";
        AC_MSG_RESULT($GNUTLSLIBS)
  fi
@@ -110,45 +110,45 @@
  # libcib for get_object_root()
  #             $(top_builddir)/lib/hbclient/libhbclient.la
  
---- pacemaker-Pacemaker-1.1.14/lib/common/Makefile.am.orig     2016-04-09 22:00:51.310632499 +0200
-+++ pacemaker-Pacemaker-1.1.14/lib/common/Makefile.am  2016-04-09 22:03:00.857293731 +0200
+--- pacemaker-Pacemaker-1.1.15/lib/common/Makefile.am.orig     2016-10-16 18:29:06.350414143 +0200
++++ pacemaker-Pacemaker-1.1.15/lib/common/Makefile.am  2016-10-16 18:32:31.890411797 +0200
 @@ -41,7 +41,7 @@
  endif
  
- libcrmcommon_la_LDFLAGS       = -version-info 8:0:5
+ libcrmcommon_la_LDFLAGS       = -version-info 9:0:6
 -libcrmcommon_la_LIBADD  = @LIBADD_DL@ $(GNUTLSLIBS) -lm
 +libcrmcommon_la_LIBADD  = @LIBADD_DL@ $(LIBPLUMB) $(GNUTLSLIBS) $(LIBXML2) $(LIBXSLT) $(libqb_LIBS) $(LIBBZ2) $(LIBUUID) -lm
  libcrmcommon_la_SOURCES += $(top_builddir)/lib/gnu/md5.c
  
  clean-generic:
---- pacemaker-Pacemaker-1.1.14/lib/cib/Makefile.am.orig        2016-04-09 22:03:33.010625713 +0200
-+++ pacemaker-Pacemaker-1.1.14/lib/cib/Makefile.am     2016-04-09 22:04:03.627291096 +0200
+--- pacemaker-Pacemaker-1.1.15/lib/cib/Makefile.am.orig        2016-04-09 22:03:33.010625713 +0200
++++ pacemaker-Pacemaker-1.1.15/lib/cib/Makefile.am     2016-04-09 22:04:03.627291096 +0200
 @@ -29,7 +29,7 @@
  libcib_la_SOURCES      += cib_file.c cib_remote.c
  
- libcib_la_LDFLAGS     = -version-info 5:0:1 -L$(top_builddir)/lib/pengine/.libs
+ libcib_la_LDFLAGS     = -version-info 5:1:1 -L$(top_builddir)/lib/pengine/.libs
 -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)
  libcib_la_CFLAGS      = -I$(top_srcdir)
  
  clean-generic:
---- pacemaker-Pacemaker-1.1.10/lib/pengine/Makefile.am.orig    2013-07-26 02:02:31.000000000 +0200
-+++ pacemaker-Pacemaker-1.1.10/lib/pengine/Makefile.am 2013-09-08 15:20:26.939438320 +0200
-@@ -32,7 +32,7 @@
- 
- libpe_status_la_LDFLAGS       = -version-info 8:0:4
- libpe_status_la_SOURCES       =  status.c unpack.c utils.c complex.c native.c group.c clone.c rules.c common.c
+--- pacemaker-Pacemaker-1.1.15/lib/pengine/Makefile.am.orig    2016-10-16 18:34:09.067077354 +0200
++++ pacemaker-Pacemaker-1.1.15/lib/pengine/Makefile.am 2016-10-16 18:35:12.180409966 +0200
+@@ -33,7 +33,7 @@
+ libpe_status_la_LDFLAGS       = -version-info 11:0:1
+ libpe_status_la_SOURCES       =  status.c unpack.c utils.c complex.c native.c \
+                          group.c clone.c rules.c common.c remote.c
 -libpe_status_la_LIBADD        =  @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la
 +libpe_status_la_LIBADD        =  @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la $(LIBXML2)
  
  clean-generic:
        rm -f *.log *.debug *~
---- pacemaker-Pacemaker-1.1.14/lib/fencing/Makefile.am.orig    2016-04-09 22:03:33.013959047 +0200
-+++ pacemaker-Pacemaker-1.1.14/lib/fencing/Makefile.am 2016-04-09 22:04:30.660623301 +0200
+--- pacemaker-Pacemaker-1.1.15/lib/fencing/Makefile.am.orig    2016-04-09 22:03:33.013959047 +0200
++++ pacemaker-Pacemaker-1.1.15/lib/fencing/Makefile.am 2016-04-09 22:04:30.660623301 +0200
 @@ -26,6 +26,6 @@
  
  libstonithd_la_SOURCES = st_client.c
- libstonithd_la_LDFLAGS = -version-info 4:0:2
+ libstonithd_la_LDFLAGS = -version-info 4:1:2
 -libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
 +libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la $(LIBPILS)
  

diff --git a/pacemaker.spec b/pacemaker.spec
index 34825699e0d9da9466f5e3ef90419edd59ab0eaf..3baf70c4713cb7109bd28ab45e35420fb35e3253 100644 (file)
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -15,13 +15,13 @@
 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.14
+Version:       1.1.15
 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: 8f9973085512b6782c019b6d9a78ca8e
+# Source0-md5: 47e0853494978bb7366a657e1fdfb12f
 Source1:       %{name}.tmpfiles
 Source2:       %{name}.init
 Source3:       %{name}.service