[pcs] Re-synced to upstream sources

[Tomas Jelinek]

commit c1e59b16a39e64e2a23dba62ef9dcbedcee746ae
Author: Tomas Jelinek <tojeline at redhat.com>
Date:   Thu Feb 19 11:32:46 2015 +0100

    Re-synced to upstream sources

 .gitignore                                         |     1 +
 ...-for-setting-certain-corosync-totem-optio.patch |   135 -
 fedfix.patch                                       |    64 +-
 pcs.spec                                           |    16 +-
 rebase.patch                                       | 82966 -------------------
 sources                                            |     2 +-
 6 files changed, 69 insertions(+), 83115 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e290852..65187a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /pcs-0.9.48.tar.gz
 /pcs-withgems-0.9.102.tar.gz
 /pcs-withgems-0.9.115.tar.gz
+/pcs-withgems-0.9.139.tar.gz
diff --git a/fedfix.patch b/fedfix.patch
index 6a7cf4f..c4870aa 100644
--- a/fedfix.patch
+++ b/fedfix.patch
@@ -1,15 +1,35 @@
+--- pcs-0.9.139/Makefile.fedfix
++++ pcs-0.9.139/Makefile
+@@ -8,14 +8,7 @@ ifeq ($(PYTHON_SITELIB), /usr/lib/python2.7/dist-packages)
+   EXTRA_SETUP_OPTS="--install-layout=deb"
+ endif
+ 
+-IS_SYSTEMCTL=false
+-ifeq ("$(wildcard /usr/bin/systemctl)","/usr/bin/systemctl")
+-  IS_SYSTEMCTL=true
+-else
+-  ifeq ("$(wildcard /bin/systemctl)","/usr/bin/systemctl")
+-    IS_SYSTEMCTL=true
+-  endif
+-endif
++IS_SYSTEMCTL=true
+ 
+ MANDIR=/usr/share/man
+ 
 --- pcs-0.9.102/pcsd/Makefile.fedfix	2013-12-13 17:59:47.983000261 -0600
 +++ pcs-0.9.102/pcsd/Makefile	2013-12-13 17:59:57.709889020 -0600
-@@ -1,5 +1,5 @@
- build_gems:
+@@ -7,7 +7,7 @@ else
+ endif
+ 
+ build_gems_normal:
 -	bundle install --local --deployment
 +	bundle install --local --path vendor/bundle
  
- get_gems:
- 	bundle package
+ # RHEL6 needs special rpam-ruby19 gem to work with 1.8.7
+ build_gems_rhel6:
 --- pcs-0.9.102/pcsd/Gemfile.fedfix	2013-12-04 17:59:26.000000000 -0600
 +++ pcs-0.9.102/pcsd/Gemfile	2013-12-13 17:58:57.063583063 -0600
-@@ -1,15 +1,15 @@
+@@ -1,16 +1,16 @@
  source 'https://rubygems.org'
  
 -gem 'sinatra'
@@ -32,4 +52,38 @@
  gem 'monkey-lib'
  gem 'rpam-ruby19'
 -gem 'multi_json'
+-gem 'open4'
 +#gem 'multi_json'
++#gem 'open4'
+--- pcs-0.9.102/pcsd/Gemfile.lock.fedfix
++++ pcs-0.9.102/pcsd/Gemfile.lock
+@@ -2,12 +2,9 @@ GEM
+   remote: https://rubygems.org/
+   specs:
+     backports (3.6.4)
+-    eventmachine (1.0.3)
+-    highline (1.6.20)
+     monkey-lib (0.5.4)
+       backports
+     multi_json (1.10.1)
+-    open4 (1.3.4)
+     rack (1.5.2)
+     rack-protection (1.5.3)
+       rack
+@@ -35,16 +32,7 @@ PLATFORMS
+ 
+ DEPENDENCIES
+   backports
+-  eventmachine
+-  highline
+   monkey-lib
+-  multi_json
+-  open4
+-  rack
+-  rack-protection
+-  rack-test
+   rpam-ruby19
+-  sinatra
+   sinatra-contrib
+   sinatra-sugar
+-  tilt
diff --git a/pcs.spec b/pcs.spec
index 53423bc..44270e7 100644
--- a/pcs.spec
+++ b/pcs.spec
@@ -1,20 +1,19 @@
 Name: pcs		
-Version: 0.9.115
-Release: 5%{?dist}
+Version: 0.9.139
+Release: 1%{?dist}
 License: GPLv2
 URL: http://github.com/feist/pcs
 Group: System Environment/Base
 BuildRequires: python2-devel ruby ruby-devel pam-devel python rubygem-bundler
 BuildRequires: rubygem-sinatra rubygem-highline rubygem-rack rubygem-rack-protection rubygem-tilt
-BuildRequires: rubygem-eventmachine rubygem-rack-test rubygem-multi_json rubygem-json
+BuildRequires: rubygem-eventmachine rubygem-rack-test rubygem-multi_json rubygem-json rubygem-open4
 Summary: Pacemaker Configuration System	
 Source0: http://people.redhat.com/cfeist/pcs/pcs-withgems-%{version}.tar.gz
 Patch0: fedfix.patch
-Patch1: rebase.patch
-Patch2: bz1078343-Add-support-for-setting-certain-corosync-totem-optio.patch
 Requires: pacemaker ruby python
+#Requires: python-clufter
 Requires: rubygem-sinatra rubygem-highline rubygem-rack rubygem-rack-protection rubygem-tilt
-Requires: rubygem-eventmachine rubygem-rack-test rubygem-multi_json rubygem-json
+Requires: rubygem-eventmachine rubygem-rack-test rubygem-multi_json rubygem-json rubygem-open4
 
 %description
 pcs is a corosync and pacemaker configuration tool.  It permits users to
@@ -24,8 +23,6 @@ easily view, modify and created pacemaker based clusters.
 %setup -q
 
 %patch0 -p1 -b .fedfix
-%patch1 -p1 -b .rebase
-%patch2 -p1 -b .bz1078343
 cd pcsd ; bundle install --local ; cd ..
 
 %build
@@ -69,6 +66,9 @@ chmod 755 $RPM_BUILD_ROOT/%{python_sitelib}/pcs/pcs.py
 %doc COPYING README
 
 %changelog
+* Thu Feb 19 2015 Tomas Jelinek <tojeline at redhat.com> - 0.9.139-1
+- Re-synced to upstream sources
+
 * Sat Jan 17 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.9.115-5
 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
 
diff --git a/sources b/sources
index b30db96..fdcb6b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f685cb630920f8527e0e520c02bb0ea6  pcs-withgems-0.9.115.tar.gz
+4a7840c015d8f7a9a7eb5e4b01ee1b3a  pcs-withgems-0.9.139.tar.gz