100 lines
2.0 KiB
Diff
100 lines
2.0 KiB
Diff
From ec05be119b13fbbbea22052a79d61a8da883c16f Mon Sep 17 00:00:00 2001
|
|
From: Tomas Jelinek <tojeline@redhat.com>
|
|
Date: Tue, 23 Jun 2015 16:29:02 +0200
|
|
Subject: [PATCH] fedfix patch
|
|
|
|
---
|
|
pcsd/Gemfile | 8 --------
|
|
pcsd/Gemfile.lock | 21 ---------------------
|
|
pcsd/Makefile | 2 +-
|
|
3 files changed, 1 insertion(+), 30 deletions(-)
|
|
|
|
diff --git a/pcsd/Gemfile b/pcsd/Gemfile
|
|
index db98546..e412e12 100644
|
|
--- a/pcsd/Gemfile
|
|
+++ b/pcsd/Gemfile
|
|
@@ -1,16 +1,8 @@
|
|
source 'https://rubygems.org'
|
|
|
|
-gem 'sinatra'
|
|
gem 'sinatra-contrib'
|
|
-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 'orderedhash'
|
|
diff --git a/pcsd/Gemfile.lock b/pcsd/Gemfile.lock
|
|
index 848758e..4ea6796 100644
|
|
--- a/pcsd/Gemfile.lock
|
|
+++ b/pcsd/Gemfile.lock
|
|
@@ -2,22 +2,10 @@ GEM
|
|
remote: https://rubygems.org/
|
|
specs:
|
|
backports (3.6.4)
|
|
- eventmachine (1.0.7)
|
|
monkey-lib (0.5.4)
|
|
backports
|
|
- multi_json (1.11.1)
|
|
- open4 (1.3.4)
|
|
orderedhash (0.0.6)
|
|
- rack (1.6.4)
|
|
- rack-protection (1.5.3)
|
|
- rack
|
|
- rack-test (0.6.3)
|
|
- rack (>= 1.0)
|
|
rpam-ruby19 (1.2.1)
|
|
- sinatra (1.4.6)
|
|
- rack (~> 1.4)
|
|
- rack-protection (~> 1.4)
|
|
- tilt (>= 1.3, < 3)
|
|
sinatra-contrib (1.4.4)
|
|
backports (>= 2.0)
|
|
multi_json
|
|
@@ -28,23 +16,14 @@ GEM
|
|
sinatra-sugar (0.5.1)
|
|
monkey-lib (~> 0.5.0)
|
|
sinatra (~> 1.0)
|
|
- tilt (1.4.1)
|
|
|
|
PLATFORMS
|
|
ruby
|
|
|
|
DEPENDENCIES
|
|
backports
|
|
- eventmachine
|
|
monkey-lib
|
|
- multi_json
|
|
- open4
|
|
orderedhash
|
|
- rack
|
|
- rack-protection
|
|
- rack-test
|
|
rpam-ruby19
|
|
- sinatra
|
|
sinatra-contrib
|
|
sinatra-sugar
|
|
- tilt
|
|
diff --git a/pcsd/Makefile b/pcsd/Makefile
|
|
index 0d28b58..d320162 100644
|
|
--- a/pcsd/Makefile
|
|
+++ b/pcsd/Makefile
|
|
@@ -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:
|
|
--
|
|
1.9.1
|
|
|