|
 |
15f218 |
From e27fb389233d1f66dcda32fa7d06192a82f5944f Mon Sep 17 00:00:00 2001
|
|
|
15f218 |
From: Ivan Devat <idevat@redhat.com>
|
|
|
15f218 |
Date: Tue, 24 May 2016 07:26:15 +0200
|
|
|
15f218 |
Subject: [PATCH] adapt working with gems to rhel 7
|
|
|
15f218 |
|
|
|
15f218 |
---
|
|
|
15f218 |
pcsd/Gemfile | 7 +------
|
|
|
15f218 |
pcsd/Gemfile.lock | 3 ---
|
|
|
15f218 |
pcsd/Makefile | 5 +----
|
|
|
15f218 |
3 files changed, 2 insertions(+), 13 deletions(-)
|
|
|
15f218 |
|
|
|
15f218 |
diff --git a/pcsd/Gemfile b/pcsd/Gemfile
|
|
|
15f218 |
index e851eaf..6526f53 100644
|
|
|
15f218 |
--- a/pcsd/Gemfile
|
|
|
15f218 |
+++ b/pcsd/Gemfile
|
|
|
15f218 |
@@ -1,9 +1,5 @@
|
|
|
15f218 |
source 'https://rubygems.org'
|
|
|
15f218 |
|
|
|
15f218 |
-source 'https://tojeline.fedorapeople.org/rubygems/' do
|
|
|
15f218 |
- gem 'rpam-ruby19-feist', :platform => :ruby_18
|
|
|
15f218 |
-end
|
|
|
15f218 |
-
|
|
|
15f218 |
gem 'sinatra'
|
|
|
15f218 |
gem 'sinatra-contrib'
|
|
|
15f218 |
gem 'rack'
|
|
|
15f218 |
@@ -12,8 +8,7 @@ gem 'tilt'
|
|
|
15f218 |
gem 'eventmachine'
|
|
|
15f218 |
gem 'rack-test'
|
|
|
15f218 |
gem 'backports'
|
|
|
15f218 |
-gem 'rpam-ruby19', :platform => [:ruby_19, :ruby_20, :ruby_21, :ruby_22]
|
|
|
15f218 |
-gem 'json'
|
|
|
15f218 |
+gem 'rpam-ruby19'
|
|
|
15f218 |
gem 'multi_json'
|
|
|
15f218 |
gem 'open4'
|
|
|
15f218 |
gem 'orderedhash'
|
|
|
15f218 |
diff --git a/pcsd/Gemfile.lock b/pcsd/Gemfile.lock
|
|
|
15f218 |
index eff055a..15ee9b3 100644
|
|
|
15f218 |
--- a/pcsd/Gemfile.lock
|
|
|
15f218 |
+++ b/pcsd/Gemfile.lock
|
|
|
15f218 |
@@ -1,10 +1,8 @@
|
|
|
15f218 |
GEM
|
|
|
15f218 |
remote: https://rubygems.org/
|
|
|
15f218 |
- remote: https://tojeline.fedorapeople.org/rubygems/
|
|
|
15f218 |
specs:
|
|
|
15f218 |
backports (3.6.8)
|
|
|
15f218 |
eventmachine (1.2.0.1)
|
|
|
15f218 |
- json (1.8.3)
|
|
|
15f218 |
multi_json (1.12.0)
|
|
|
15f218 |
open4 (1.3.4)
|
|
|
15f218 |
orderedhash (0.0.6)
|
|
|
15f218 |
@@ -33,7 +31,6 @@ PLATFORMS
|
|
|
15f218 |
DEPENDENCIES
|
|
|
15f218 |
backports
|
|
|
15f218 |
eventmachine
|
|
|
15f218 |
- json
|
|
|
15f218 |
multi_json
|
|
|
15f218 |
open4
|
|
|
15f218 |
orderedhash
|
|
|
15f218 |
diff --git a/pcsd/Makefile b/pcsd/Makefile
|
|
|
15f218 |
index 798a8bd..08d9cf1 100644
|
|
|
15f218 |
--- a/pcsd/Makefile
|
|
|
15f218 |
+++ b/pcsd/Makefile
|
|
|
15f218 |
@@ -1,4 +1,4 @@
|
|
|
15f218 |
-build_gems: get_gems
|
|
|
15f218 |
+build_gems:
|
|
|
15f218 |
bundle install --local --deployment
|
|
|
15f218 |
|
|
|
15f218 |
# RHEL6 needs special rpam-ruby19 gem to work with 1.8.7
|
|
|
15f218 |
@@ -21,8 +21,5 @@ build_gems_rhel6:
|
|
|
15f218 |
vendor/cache/sinatra-contrib-1.4.7.gem \
|
|
|
15f218 |
-- '--with-ldflags="-Wl,-z,now -Wl,-z,relro"'
|
|
|
15f218 |
|
|
|
15f218 |
-get_gems:
|
|
|
15f218 |
- bundle package
|
|
|
15f218 |
-
|
|
|
15f218 |
clean:
|
|
|
15f218 |
rm -rfv vendor/
|
|
|
15f218 |
--
|
|
|
15f218 |
1.8.3.1
|
|
|
15f218 |
|