From 16a12923efe79dd37b88f8ce2b4cf3af644de67b Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Tue, 18 Feb 2014 13:47:36 +1100
Subject: [PATCH] Update to 1.1.11

---
 .gitignore     |  1 +
 pacemaker.spec | 21 ++++++++++-----------
 sources        |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0f7d5a7..5b52eb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /ClusterLabs-pacemaker-394e906.tar.gz
 /ClusterLabs-pacemaker-70ad9fa.tar.gz
 /ClusterLabs-pacemaker-781a388.tar.gz
+/ClusterLabs-pacemaker-9d39a6b.tar.gz
diff --git a/pacemaker.spec b/pacemaker.spec
index 64faf12..f16c3f2 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -2,8 +2,8 @@
 %global uname hacluster
 %global pcmk_docdir %{_docdir}/%{name}
 
-%global specversion 3
-%global upstream_version 781a388
+%global specversion 1
+%global upstream_version 9d39a6b
 %global upstream_prefix ClusterLabs-pacemaker
 
 %global py_site %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
@@ -49,8 +49,8 @@
 
 Name:          pacemaker
 Summary:       Scalable High-Availability cluster resource manager
-Version:       1.1.9
-Release:       %{pcmk_release}%{?dist}.2
+Version:       1.1.11
+Release:       %{pcmk_release}%{?dist}
 License:       GPLv2+ and LGPLv2+
 Url:           http://www.clusterlabs.org
 Group:         System Environment/Daemons
@@ -59,7 +59,6 @@ Group:         System Environment/Daemons
 # wget --no-check-certificate -O ClusterLabs-pacemaker-${VER}.tar.gz https://github.com/ClusterLabs/pacemaker/tarball/${VER}
 Source0:       %{upstream_prefix}-%{upstream_version}.tar.gz
 Patch0:        pacemaker-1.1.8-cast-align.patch
-Patch1:        pacemaker-7d8acec.patch
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 AutoReqProv:   on
 Requires:      resource-agents
@@ -96,7 +95,7 @@ Requires:      libqb > 0.11.0
 
 # Enables optional functionality
 BuildRequires: ncurses-devel openssl-devel libselinux-devel docbook-style-xsl
-BuildRequires: bison byacc flex help2man
+BuildRequires: bison byacc flex help2man dbus-devel
 
 %if %{defined _unitdir}
 BuildRequires: systemd-devel
@@ -256,7 +255,6 @@ manager for Corosync, CMAN and/or Linux-HA.
 %prep
 %setup -q -n %{upstream_prefix}-%{upstream_version}
 %patch0 -p1 -R
-%patch1 -p1
 
 # Force the local time
 #
@@ -386,9 +384,6 @@ exit 0
 %{_sbindir}/attrd_updater
 %{_sbindir}/fence_legacy
 %{_sbindir}/fence_pcmk
-%{_bindir}/ccs2cib
-%{_bindir}/ccs_flatten
-%{_bindir}/disable_rgmanager
 %{_sbindir}/stonith_admin
 
 %doc %{_mandir}/man7/*
@@ -517,9 +512,13 @@ exit 0
 %doc AUTHORS
 
 %changelog
+* Tue Feb 18 2014 Andrew Beekhof <abeekhof@redhat.com> - 1.1.11-1
+- Update for new upstream tarball: Pacemaker-1.1.11 (9d39a6b)
+- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.9-3.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
+ 
 * Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 1.1.9-3.1
 - Perl 5.18 rebuild
 
diff --git a/sources b/sources
index d443161..2d1c018 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e33c30b5ef99d4e69f202f2821650b43  ClusterLabs-pacemaker-781a388.tar.gz
+6938f0c75e899f63ea6ebc6faca4cb8d  ClusterLabs-pacemaker-9d39a6b.tar.gz