- updated to 1.1.13

- updated man,libs patches
- require heartbeat 3.0.6 (for new daemons location)

diff --git a/pacemaker-libs.patch b/pacemaker-libs.patch
index 1581d04fe6c25acb364fb8c6ed5ef8e0ceb41821..5075d5724305f08cc70f95ed1f71bb37e402a159 100644 (file)
--- a/pacemaker-libs.patch
+++ b/pacemaker-libs.patch
@@ -120,12 +120,12 @@
  # libcib for get_object_root()
  #             $(top_builddir)/lib/hbclient/libhbclient.la
  
---- 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
+--- pacemaker-Pacemaker-1.1.13/lib/common/Makefile.am.orig     2014-02-14 19:44:12.731276928 +0100
++++ pacemaker-Pacemaker-1.1.13/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_LDFLAGS       = -version-info 7:0:4
 -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
@@ -136,7 +136,7 @@
 @@ -33,7 +33,7 @@
  endif
  
- libcib_la_LDFLAGS     = -version-info 3:1:0 -L$(top_builddir)/lib/pengine/.libs
+ libcib_la_LDFLAGS     = -version-info 4:1:0 -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)
@@ -146,7 +146,7 @@
 +++ 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 6:0:2
+ 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
 -libpe_status_la_LIBADD        =  @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la
 +libpe_status_la_LIBADD        =  @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la $(LIBXML2)
@@ -158,7 +158,7 @@
 @@ -26,6 +26,6 @@
  
  libstonithd_la_SOURCES = st_client.c
- libstonithd_la_LDFLAGS = -version-info 3:0:1
+ libstonithd_la_LDFLAGS = -version-info 3:2:1
 -libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
 +libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la $(LIBPILS)
  

diff --git a/pacemaker-man.patch b/pacemaker-man.patch
index e025de7ff0bdcf31f030c045d43584f14543485d..de090a1fb306517548490fce0cd08d664b385383 100644 (file)
--- a/pacemaker-man.patch
+++ b/pacemaker-man.patch
@@ -1,11 +1,11 @@
---- pacemaker-Pacemaker-1.1.10/tools/Makefile.am.orig  2013-07-26 02:02:31.000000000 +0200
-+++ pacemaker-Pacemaker-1.1.10/tools/Makefile.am       2013-09-08 08:12:08.253850125 +0200
-@@ -58,7 +58,7 @@
- endif
+--- 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))
+-man8_MANS             = $(sbin_PROGRAMS:%=%.8) $(sbin_SCRIPTS:%=%.8)
++man8_MANS             = $(filter-out ipmiservicelogd.8, $(sbin_PROGRAMS:%=%.8) $(sbin_SCRIPTS:%=%.8))
  endif
  
- ## SOURCES
+ %.8:  % $(MAN8DEPS)

diff --git a/pacemaker.spec b/pacemaker.spec
index a1fb66cf55d5d08f231bb32b86d68dee74e7e092..fcb90f62ea97e750bea2e501e2b5857d61a1adfb 100644 (file)
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -14,12 +14,12 @@
 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.11
-Release:       4
+Version:       1.1.13
+Release:       1
 License:       GPL v2+, LGPL v2.1+
 Group:         Applications/System
 Source0:       https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-%{version}.tar.gz
-# Source0-md5: 7cbe4f8ef2b300c3426a0c12a0c67c93
+# Source0-md5: 219a1b5864013101dae3f9977f342b87
 Source1:       %{name}.tmpfiles
 Source2:       %{name}.init
 Source3:       %{name}.service
@@ -45,7 +45,7 @@ BuildRequires:        gettext-tools
 BuildRequires: glib2-devel >= 2.0
 BuildRequires: gnutls-devel
 BuildRequires: help2man
-%{?with_heartbeat:BuildRequires:       heartbeat-devel >= 3.0.5-6}
+%{?with_heartbeat:BuildRequires:       heartbeat-devel >= 3.0.6}
 BuildRequires: libesmtp-devel
 BuildRequires: libltdl-devel
 BuildRequires: libqb-devel >= 0.13
@@ -137,9 +137,8 @@ Summary:    Pacemaker for Heartbeat cluster
 Summary(pl.UTF-8):     Pacemaker dla klastra Heartbeat
 Group:         Applications/System
 Requires:      %{name} = %{version}-%{release}
-Requires:      heartbeat
+Requires:      heartbeat >= 3.0.6
 Obsoletes:     pacemaker < 1.1
-Conflicts:     heartbeat < 2.99.0
 
 %description heartbeat
 This package allows using Pacemaker on a Heartbeat cluster.
@@ -210,11 +209,14 @@ CPPFLAGS="%{rpmcppflags} %{?with_heartbeat:-I/usr/include/heartbeat}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{/var/run/crm,/var/log}
 
 %{__make} install \
        mibdir=%{_datadir}/mibs \
        DESTDIR=$RPM_BUILD_ROOT
 
+touch $RPM_BUILD_ROOT/var/log/pacemaker.log
+
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/pacemaker
 
 install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
@@ -297,6 +299,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/cibmon
 %attr(755,root,root) %{_libdir}/%{name}/crmd
 %attr(755,root,root) %{_libdir}/%{name}/lrmd
+%attr(755,root,root) %{_libdir}/%{name}/lrmd_internal_ctl
 %attr(755,root,root) %{_libdir}/%{name}/lrmd_test
 %attr(755,root,root) %{_libdir}/%{name}/pengine
 %attr(755,root,root) %{_libdir}/%{name}/stonith-test
@@ -304,6 +307,9 @@ fi
 %{_datadir}/pacemaker
 %{_datadir}/mibs/PCMK-MIB.txt
 %{py_sitedir}/cts
+%{systemdunitdir}/crm_mon.service
+%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/pacemaker
+%ghost /var/log/pacemaker.log
 %{_mandir}/man7/crmd.7*
 %{_mandir}/man7/ocf_pacemaker_*.7*
 %{_mandir}/man7/pengine.7*
@@ -333,6 +339,8 @@ 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
@@ -357,13 +365,13 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcib.so.3
+%attr(755,root,root) %ghost %{_libdir}/libcib.so.4
 %attr(755,root,root) %{_libdir}/libcrmcluster.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcrmcluster.so.4
 %attr(755,root,root) %{_libdir}/libcrmcommon.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcrmcommon.so.3
 %attr(755,root,root) %{_libdir}/libcrmservice.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcrmservice.so.1
+%attr(755,root,root) %ghost %{_libdir}/libcrmservice.so.3
 %attr(755,root,root) %{_libdir}/liblrmd.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblrmd.so.1
 %attr(755,root,root) %{_libdir}/libpe_rules.so.*.*.*
@@ -432,11 +440,6 @@ fi
 %files heartbeat
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/crm_uuid
-%attr(755,root,root) %{_libdir}/heartbeat/attrd
-%attr(755,root,root) %{_libdir}/heartbeat/cib
-%attr(755,root,root) %{_libdir}/heartbeat/crmd
-%attr(755,root,root) %{_libdir}/heartbeat/pengine
-%attr(755,root,root) %{_libdir}/heartbeat/stonithd
 %{_mandir}/man8/crm_uuid.8*
 %endif