From 51f9320a015f6dc659c7d872fdc528c0ca911deb Mon Sep 17 00:00:00 2001
From: Chris Feist <cfeist@redhat.com>
Date: Mar 25 2013 19:35:02 +0000
Subject: Merge branch 'f18' into f19


Conflicts:
	pcs.spec

---

diff --git a/.gitignore b/.gitignore
index f5efa06..9f5ac96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /pcs-0.9.27.tar.gz
 /pcs-0.9.32.tar.gz
 /pcs-0.9.33.tar.gz
+/pcs-0.9.36.tar.gz
diff --git a/fedfix.patch b/fedfix.patch
new file mode 100644
index 0000000..30516ca
--- /dev/null
+++ b/fedfix.patch
@@ -0,0 +1,42 @@
+Index: pcs/pcs-0.9.36/pcsd/Makefile
+===================================================================
+--- pcs.orig/pcs-0.9.36/pcsd/Makefile
++++ pcs/pcs-0.9.36/pcsd/Makefile
+@@ -1,4 +1,4 @@
+-PCSD_GEMS=sinatra sinatra-contrib json highline rack rack-protection tilt eventmachine rack-test backports sinatra-sugar monkey-lib rpam-ruby19
++PCSD_GEMS=rpam-ruby19
+ 
+ tarball:
+ 	rm -f dist/pcsd.tar.gz
+Index: pcs/pcs-0.9.36/pcsd/pcsd.rb
+===================================================================
+--- pcs.orig/pcs-0.9.36/pcsd/pcsd.rb
++++ pcs/pcs-0.9.36/pcsd/pcsd.rb
+@@ -1,5 +1,5 @@
+ require 'sinatra'
+-require 'sinatra/reloader' if development?  #require 'rack/ssl'
++#require 'sinatra/reloader' if development?  #require 'rack/ssl'
+ require 'open3'
+ require 'rexml/document'
+ require 'resource.rb'
+@@ -18,13 +18,13 @@ require 'logger'
+ use Rack::CommonLogger
+ #use Rack::SSL
+ 
+-also_reload 'resource.rb'
+-also_reload 'remote.rb'
+-also_reload 'fenceagent.rb'
+-also_reload 'cluster.rb'
+-also_reload 'config.rb'
+-also_reload 'pcs.rb'
+-also_reload 'auth.rb'
++#also_reload 'resource.rb'
++#also_reload 'remote.rb'
++#also_reload 'fenceagent.rb'
++#also_reload 'cluster.rb'
++#also_reload 'config.rb'
++#also_reload 'pcs.rb'
++#also_reload 'auth.rb'
+ 
+ enable :sessions
+ 
diff --git a/pcs.spec b/pcs.spec
index 15eb541..8a00470 100644
--- a/pcs.spec
+++ b/pcs.spec
@@ -1,13 +1,14 @@
 Name: pcs		
-Version: 0.9.33
+Version: 0.9.36
 Release: 2%{?dist}
 License: GPLv2
 URL: http://github.com/feist/pcs
 Group: System Environment/Base
-BuildRequires: python2-devel ruby ruby-devel pam-devel
+BuildRequires: python2-devel ruby ruby-devel pam-devel rubygem-sinatra rubygem-json rubygem-rack-test
 Summary: Pacemaker Configuration System	
 Source0: http://people.redhat.com/cfeist/pcs/pcs-%{version}.tar.gz
-Requires: pacemaker ruby
+Patch0: fedfix.patch
+Requires: pacemaker ruby rubygem-sinatra rubygem-json rubygem-rack-test
 
 %description
 pcs is a corosync and pacemaker configuration tool.  It permits users to
@@ -15,6 +16,7 @@ easily view, modify and created pacemaker based clusters.
 
 %prep
 %setup -q
+%patch0 -p2 -b .fedfix
 
 %build
 
@@ -22,6 +24,7 @@ easily view, modify and created pacemaker based clusters.
 rm -rf $RPM_BUILD_ROOT
 pwd
 make install DESTDIR=$RPM_BUILD_ROOT PYTHON_SITELIB=%{python_sitelib}
+make install_pcsd DESTDIR=$RPM_BUILD_ROOT PYTHON_SITELIB=%{python_sitelib}
 chmod 755 $RPM_BUILD_ROOT/%{python_sitelib}/pcs/pcs.py
 
 %files
@@ -37,8 +40,11 @@ chmod 755 $RPM_BUILD_ROOT/%{python_sitelib}/pcs/pcs.py
 %doc COPYING README
 
 %changelog
-* Wed Mar 13 2013 Chris Feist <cfeist@redhat.com> - 0.9.33-1
-- Rebuild for missing libruby.so.1.9
+* Mon Mar 25 2013 Chris Feist <cfeist@redhat.com> - 0.9.36-2
+- Removed duplicate libraries already present in fedora
+
+* Mon Mar 18 2013 Chris Feist <cfeist@redhat.com> - 0.9.36-1
+- Resynced to latest upstream
 
 * Mon Mar 11 2013 Chris Feist <cfeist@redhat.com> - 0.9.33-1
 - Resynched to latest upstream
diff --git a/sources b/sources
index 294eb2a..0029f16 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7fa7ee079ed754f105147a879d2d6107  pcs-0.9.33.tar.gz
+6b16990c85c658ba3098a553bedf7923  pcs-0.9.36.tar.gz