pcs/fedfix.patch
2015-02-19 14:28:35 +01:00

90 lines
1.9 KiB
Diff

--- 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
@@ -7,7 +7,7 @@ else
endif
build_gems_normal:
- bundle install --local --deployment
+ bundle install --local --path vendor/bundle
# 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,16 +1,16 @@
source 'https://rubygems.org'
-gem 'sinatra'
+#gem 'sinatra'
gem 'sinatra-contrib'
-gem 'highline'
-gem 'rack'
-gem 'rack-protection'
-gem 'tilt'
-gem 'eventmachine'
-gem 'rack-test'
+#gem 'highline'
+#gem 'rack'
+#gem 'rack-protection'
+#gem 'tilt'
+#gem 'eventmachine'
+#gem 'rack-test'
gem 'backports'
gem 'sinatra-sugar'
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