- updated to 1.1.11

- updated libs patch
- removed obsolete corosync patch

diff --git a/pacemaker-corosync.patch b/pacemaker-corosync.patch
deleted file mode 100644 (file)
index f1011b9..0000000
--- a/pacemaker-corosync.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- pacemaker-Pacemaker-1.1.10/include/crm/cluster.h.orig      2013-07-26 02:02:31.000000000 +0200
-+++ pacemaker-Pacemaker-1.1.10/include/crm/cluster.h   2013-09-07 17:08:13.369459479 +0200
-@@ -195,7 +195,9 @@
- const char *get_local_node_name(void);
- char *get_node_name(uint32_t nodeid);
- 
-+#if SUPPORT_COROSYNC
- char *pcmk_message_common_cs(cpg_handle_t handle, uint32_t nodeid, uint32_t pid, void *msg,
-                         uint32_t *kind, const char **from);
-+#endif
- 
- #endif

diff --git a/pacemaker-libs.patch b/pacemaker-libs.patch
index 7620da94ada898d4a550332c3268368bda52f5b2..1581d04fe6c25acb364fb8c6ed5ef8e0ceb41821 100644 (file)
--- a/pacemaker-libs.patch
+++ b/pacemaker-libs.patch
@@ -1,6 +1,6 @@
---- pacemaker-Pacemaker-1.1.10/configure.ac.orig       2013-09-08 08:13:21.430513721 +0200
-+++ pacemaker-Pacemaker-1.1.10/configure.ac    2013-09-08 13:42:48.939684155 +0200
-@@ -612,17 +612,21 @@
+--- pacemaker-Pacemaker-1.1.11/configure.ac.orig       2014-02-14 19:38:11.914625405 +0100
++++ pacemaker-Pacemaker-1.1.11/configure.ac    2014-02-14 19:43:35.904611808 +0100
+@@ -614,17 +614,21 @@
  dnl ===============================================
  dnl Libraries
  dnl ===============================================
@@ -12,15 +12,15 @@
 -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_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_getparam sched_setparam sched_get_priority_min])
+ 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_CHECK_LIB(uuid, uuid_parse, [LIBUUID=-luuid])      dnl load the library if necessary
 +AC_SUBST([LIBUUID])
 +oldLIBS="$LIBS"
 +LIBS="$LIBS $LIBUUID"
@@ -29,7 +29,7 @@
  
  AC_CHECK_HEADERS(uuid/uuid.h)
  
-@@ -764,8 +766,10 @@
+@@ -772,8 +776,10 @@
  else
     XML2HEAD="`$XML2CONFIG --cflags`"
     AC_MSG_RESULT($XML2HEAD)
@@ -42,7 +42,7 @@
  fi
  
  CPPFLAGS="$CPPFLAGS $XML2HEAD"
-@@ -830,7 +832,8 @@
+@@ -838,7 +844,8 @@
  dnl   bzip2
  dnl ========================================================================
  AC_CHECK_HEADERS(bzlib.h)
@@ -52,7 +52,7 @@
  
  if test x$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress != xyes ; then
     AC_MSG_ERROR(BZ2 libraries not found)
-@@ -992,7 +994,8 @@
+@@ -1000,7 +1007,8 @@
  
  PKG_CHECK_MODULES(libqb, libqb, HAVE_libqb=1, HAVE_libqb=0)
  AC_CHECK_HEADERS(qb/qbipc_common.h)
@@ -62,7 +62,7 @@
  
  LIBQB_LOG=1
  PCMK_FEATURES="$PCMK_FEATURES libqb-logging libqb-ipc"
-@@ -1003,7 +1005,6 @@
+@@ -1013,7 +1021,6 @@
     AC_MSG_FAILURE(Version of libqb is too old: v0.13 or greater requried)
  fi
  
@@ -70,7 +70,7 @@
  
  AC_CHECK_HEADERS(heartbeat/hb_config.h)
  AC_CHECK_HEADERS(heartbeat/glue_config.h)
-@@ -1030,8 +1031,10 @@
+@@ -1040,8 +1047,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
@@ -83,7 +83,7 @@
  fi
  
  dnl ===============================================
-@@ -1526,7 +1527,7 @@
+@@ -1545,7 +1554,7 @@
      AC_MSG_RESULT($SUPPORT_ACL)
  
      SUPPORT_ACL=1
@@ -92,7 +92,7 @@
      if test $ac_cv_lib_qb_qb_ipcs_connection_auth_set != yes; then
          SUPPORT_ACL=0
      fi
-@@ -1592,8 +1593,11 @@
+@@ -1611,8 +1620,11 @@
        GNUTLSLIBS="`$LIBGNUTLS_CONFIG --libs`";
        AC_MSG_RESULT($GNUTLSLIBS)
  fi
@@ -120,14 +120,14 @@
  # libcib for get_object_root()
  #             $(top_builddir)/lib/hbclient/libhbclient.la
  
---- pacemaker-Pacemaker-1.1.10/lib/common/Makefile.am.orig     2013-07-26 02:02:31.000000000 +0200
-+++ pacemaker-Pacemaker-1.1.10/lib/common/Makefile.am  2013-09-08 15:15:32.782783998 +0200
+--- pacemaker-Pacemaker-1.1.11/lib/common/Makefile.am.orig     2014-02-14 19:44:12.731276928 +0100
++++ pacemaker-Pacemaker-1.1.11/lib/common/Makefile.am  2014-02-14 19:53:20.877920591 +0100
 @@ -38,7 +38,7 @@
  endif
  
  libcrmcommon_la_LDFLAGS       = -version-info 5:0:2
--libcrmcommon_la_LIBADD  = -ldl $(GNUTLSLIBS)
-+libcrmcommon_la_LIBADD  = -ldl $(LIBPLUMB) $(GNUTLSLIBS) $(LIBXML2) $(LIBXSLT) $(LIBQB) $(LIBBZ2) $(LIBUUID)
+-libcrmcommon_la_LIBADD  = @LIBADD_DL@ $(GNUTLSLIBS)
++libcrmcommon_la_LIBADD  = @LIBADD_DL@ $(LIBPLUMB) $(GNUTLSLIBS) $(LIBXML2) $(LIBXSLT) $(LIBQB) $(LIBBZ2) $(LIBUUID)
  libcrmcommon_la_SOURCES += $(top_builddir)/lib/gnu/md5.c
  
  clean-generic:

diff --git a/pacemaker.spec b/pacemaker.spec
index fb8abb1569bbd9004b0873585fd6a62712b4db84..cf51436bfb1f7887f555119d83678ed88b0ac931 100644 (file)
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -14,31 +14,34 @@
 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.10
+Version:       1.1.11
 Release:       1
 License:       GPL v2+, LGPL v2.1+
 Group:         Applications/System
 Source0:       https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-%{version}.tar.gz
-# Source0-md5: 532ec5d62b9437204a9f18fa3d5a89fc
+# Source0-md5: 7cbe4f8ef2b300c3426a0c12a0c67c93
 Source1:       %{name}.tmpfiles
 Source2:       %{name}.init
 Source3:       %{name}.service
 Patch0:                %{name}-automake.patch
 Patch1:                %{name}-manpage_xslt.patch
-Patch2:                %{name}-corosync.patch
-Patch3:                %{name}-update.patch
-Patch4:                %{name}-man.patch
-Patch5:                %{name}-libs.patch
+Patch2:                %{name}-update.patch
+Patch3:                %{name}-man.patch
+Patch4:                %{name}-libs.patch
 URL:           http://clusterlabs.org/wiki/Main_Page
 %{?with_ipmi:BuildRequires:    OpenIPMI-devel}
 BuildRequires: asciidoc
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
+BuildRequires: bison
 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-devel
 BuildRequires: glib2-devel >= 2.0
 BuildRequires: gnutls-devel
 BuildRequires: help2man
@@ -52,14 +55,15 @@ BuildRequires:      libuuid-devel
 BuildRequires: libxml2-devel >= 2.0
 BuildRequires: libxslt-devel
 BuildRequires: libxslt-progs
-BuildRequires: ncurses-devel
+BuildRequires: ncurses-devel >= 5.4
 BuildRequires: net-snmp-devel
 BuildRequires: pam-devel
 BuildRequires: pciutils-devel
 BuildRequires: pkgconfig
 BuildRequires: python-devel
 BuildRequires: rpm-pythonprov
-BuildRequires:  rpmbuild(macros) >= 1.644
+BuildRequires: rpmbuild(macros) >= 1.644
+BuildRequires: systemd-units
 BuildRequires: swig
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      cluster-glue
@@ -149,7 +153,7 @@ Summary(pl.UTF-8):  Pacemaker dla klastra Corosync
 Group:         Applications/System
 Requires:      %{name} = %{version}-%{release}
 Requires:      corosync
-Requires:       systemd-units >= 38
+Requires:      systemd-units >= 38
 %{?with_heartbeat:%requires_eq heartbeat-libs}
 
 %description corosync
@@ -162,7 +166,7 @@ Ten pakiet pozwala na używanie Pacemakera na klastrze Corosync.
 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:      systemd-units >= 38
 Requires:      %{name} = %{version}-%{release}
 
 %description remote
@@ -183,7 +187,6 @@ lub w kontenerach uruchomionych na klastrze opartym o Pacemaker.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 %{__libtoolize}
@@ -233,8 +236,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %preun
 if [ "$1" = "0" ]; then
-        %service %{name} stop
-        /sbin/chkconfig --del %{name}
+       %service %{name} stop
+       /sbin/chkconfig --del %{name}
 fi
 
 %preun corosync
@@ -254,8 +257,8 @@ fi
 %postun remote
 %systemd_reload
 
-%post   libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)