Upstream refresh

.gitignore

@@ -13,3 +13,4 @@
 /ClusterLabs-pacemaker-781a388.tar.gz
 /ClusterLabs-pacemaker-9d39a6b.tar.gz
 /pacemaker-a9c81774b89f21f990be255f9862446d1a38afee.tar.gz
+/pacemaker-6052cd16c2f455809f8088af76ce86483bf98353.tar.gz

pacemaker.spec

@@ -3,7 +3,7 @@
 %global pcmk_docdir %{_docdir}/%{name}
 
 %global specversion 2
-%global commit a9c81774b89f21f990be255f9862446d1a38afee
+%global commit 6052cd16c2f455809f8088af76ce86483bf98353
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global github_owner ClusterLabs
 
@@ -50,14 +50,13 @@
 
 Name:          pacemaker
 Summary:       Scalable High-Availability cluster resource manager
-Version:       1.1.12
+Version:       1.1.13
 Release:       %{pcmk_release}%{?dist}.1
 License:       GPLv2+ and LGPLv2+
 Url:           http://www.clusterlabs.org
 Group:         System Environment/Daemons
 
 Source0:       https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
-Patch1:        pacemaker-systemd.patch
 
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 AutoReqProv:   on
@@ -65,7 +64,6 @@ Requires:      resource-agents
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      %{name}-cluster-libs = %{version}-%{release}
 Requires:      %{name}-cli = %{version}-%{release}
-Requires:      python >= 2.4
 
 %if %{defined systemd_requires}
 %systemd_requires
@@ -75,12 +73,6 @@ Requires:      python >= 2.4
 ExclusiveArch: i686 x86_64
 %endif
 
-%if 0%{?suse_version}
-# Suse splits this off into a separate package
-Requires:      python-curses python-xml
-BuildRequires: python-curses python-xml
-%endif
-
 # Required for core functionality
 BuildRequires: automake autoconf libtool pkgconfig python libtool-ltdl-devel
 BuildRequires: glib2-devel libxml2-devel libxslt-devel libuuid-devel
@@ -333,6 +325,12 @@ rm -rf %{buildroot}
 %postun
 %systemd_postun_with_restart pacemaker.service 
 
+%post cli
+%systemd_post crm_mon.service
+
+%preun cli
+%systemd_preun crm_mon.service
+
 %post remote
 %systemd_post pacemaker_remote.service
 
@@ -403,10 +401,11 @@ exit 0
 %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cores
 %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/pengine
 %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/blackbox
-%ghost %dir %attr (750, %{uname}, %{gname}) %{_var}/run/crm
 %dir /usr/lib/ocf
 %dir /usr/lib/ocf/resource.d
 /usr/lib/ocf/resource.d/pacemaker
+/usr/lib/ocf/resource.d/.isolation
+
 
 %if 0%{?cs_major} < 2
 %if 0%{?cs_minor} < 8
@@ -421,6 +420,11 @@ exit 0
 
 %files cli
 %defattr(-,root,root)
+
+%if %{defined _unitdir}
+%{_unitdir}/crm_mon.service
+%endif
+
 %{_sbindir}/cibadmin
 %{_sbindir}/crm_diff
 %{_sbindir}/crm_error
@@ -512,10 +516,14 @@ exit 0
 %doc AUTHORS
 
 %changelog
+* Thu Aug 20 2015 Andrew Beekhof <abeekhof@redhat.com> - 1.1.13-1
+- Update for new upstream tarball: Pacemaker-1.1.13
+- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.12-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
-* Tue Nov 05 2014 Andrew Beekhof <abeekhof@redhat.com> - 1.1.12-2
+* Wed Nov 05 2014 Andrew Beekhof <abeekhof@redhat.com> - 1.1.12-2
 - Address incorrect use of the dbus API for interacting with systemd
 
 * Tue Oct 28 2014 Andrew Beekhof <abeekhof@redhat.com> - 1.1.12-1

sources

@@ -1 +1 @@
-fbb13114e153ea092423b12f11a5e464  pacemaker-a9c81774b89f21f990be255f9862446d1a38afee.tar.gz
+43529bc70e86c4a747c135eb9cf8ce8f  pacemaker-6052cd16c2f455809f8088af76ce86483bf98353.tar.gz