[pcs/f18] Removed duplicate libraries already present in fedora
cfeist
cfeist at fedoraproject.org
Mon Mar 25 19:30:36 UTC 2013
commit b23d2bf4cf3863729de9f41ef6b05b4b995e7ac4
Author: Chris Feist <cfeist at redhat.com>
Date: Mon Mar 25 14:30:08 2013 -0500
Removed duplicate libraries already present in fedora
fedfix.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
pcs.spec | 11 ++++++++---
2 files changed, 50 insertions(+), 3 deletions(-)
---
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 9c9a84c..8a00470 100644
--- a/pcs.spec
+++ b/pcs.spec
@@ -1,13 +1,14 @@
Name: pcs
Version: 0.9.36
-Release: 1%{?dist}
+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
@@ -38,6 +40,9 @@ chmod 755 $RPM_BUILD_ROOT/%{python_sitelib}/pcs/pcs.py
%doc COPYING README
%changelog
+* Mon Mar 25 2013 Chris Feist <cfeist at redhat.com> - 0.9.36-2
+- Removed duplicate libraries already present in fedora
+
* Mon Mar 18 2013 Chris Feist <cfeist at redhat.com> - 0.9.36-1
- Resynced to latest upstream
More information about the scm-commits
mailing list