From bc00b0b8dcb2c72d639c4a5ce298d62fa895035d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Sat, 8 Mar 2014 13:13:52 +0100
Subject: [PATCH] Try to use nokogiri from the system (it would bundle libxslt
 and libxml2 otherwise).

---
 rocci-server/debian/control                |  6 ++++--
 rocci-server/debian/patches/unbundle.patch | 33 +++++++++++++++++++++---------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/rocci-server/debian/control b/rocci-server/debian/control
index f21a9f6..4191d36 100644
--- a/rocci-server/debian/control
+++ b/rocci-server/debian/control
@@ -3,7 +3,9 @@ Section: ruby
 Priority: optional
 Maintainer: František Dvořák <valtri@civ.zcu.cz>
 Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 8), bundler, git, ca-certificates, ruby-dev, libssl-dev, rake, ruby-redcarpet, yard
+Build-Depends:
+    debhelper (>= 8), bundler, ca-certificates, git, libssl-dev, rake,
+    ruby-redcarpet, ruby-dev, ruby-nokogiri, yard
 # gem2deb - not working with local deps
 Vcs-Browser: https://github.com/EGI-FCTF/rOCCI-server
 Vcs-Git: https://github.com/EGI-FCTF/rOCCI-server.git
@@ -14,7 +16,7 @@ Architecture: any
 #XB-Ruby-Versions: ${ruby:Versions}
 Pre-Depends: ${misc:Pre-Depends}
 Depends:
-    bundler, git, memcached, ruby | ruby-interpreter
+    bundler, git, memcached, ruby | ruby-interpreter, ruby-nokogiri,
     ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Suggests: rocci-server-apache
 Description: Ruby OCCI Server
diff --git a/rocci-server/debian/patches/unbundle.patch b/rocci-server/debian/patches/unbundle.patch
index 669a800..5ba2837 100644
--- a/rocci-server/debian/patches/unbundle.patch
+++ b/rocci-server/debian/patches/unbundle.patch
@@ -1,11 +1,14 @@
-commit 1eccf855b481ff7867f30f3571b57082ad2ffaa7
+commit 78a0c6345dbdd7050d4cbf420d3a0f3abe34d204
 Author: František Dvořák <valtri@civ.zcu.cz>
-Date:   Fri Mar 7 13:16:09 2014 +0100
+Date:   Sat Mar 8 13:09:34 2014 +0100
 
-    Use system passenger, rake, yard and redcarpet.
+    Use from system:
+    - passenger (apache module)
+    - nokogiri (bundles libxslt, libxml2)
+    - rake, yard, redcarpet
 
 diff --git a/Gemfile b/Gemfile
-index 43fb151..af98c4b 100644
+index 94a3593..c82753b 100644
 --- a/Gemfile
 +++ b/Gemfile
 @@ -25,9 +25,6 @@ gem 'debugger', group: [:development, :test]
@@ -30,13 +33,23 @@ index 43fb151..af98c4b 100644
  #
  # Add the following to your ~/.irbrc:
 diff --git a/Gemfile.lock b/Gemfile.lock
-index 5a40d60..14a5367 100644
+index 2823ef1..667a903 100644
 --- a/Gemfile.lock
 +++ b/Gemfile.lock
-@@ -139,10 +139,6 @@ GEM
+@@ -128,8 +128,6 @@ GEM
+     net-ssh-gateway (1.2.0)
+       net-ssh (>= 2.6.5)
+     nio4r (1.0.0)
+-    nokogiri (1.6.1)
+-      mini_portile (~> 0.5.0)
+     occi-core (4.2.10)
+       activesupport (~> 4.0.0)
+       hashie
+@@ -138,11 +136,6 @@ GEM
+       uuidtools (>= 2.1.3)
      opennebula (4.4.0)
        json
-       nokogiri
+-      nokogiri
 -    passenger (4.0.29)
 -      daemon_controller (>= 1.1.0)
 -      rack
@@ -44,7 +57,7 @@ index 5a40d60..14a5367 100644
      polyglot (0.3.4)
      pry (0.9.12.6)
        coderay (~> 1.0)
-@@ -173,15 +169,12 @@ GEM
+@@ -173,15 +166,12 @@ GEM
      railties (4.0.3)
        actionpack (= 4.0.3)
        activesupport (= 4.0.3)
@@ -60,7 +73,7 @@ index 5a40d60..14a5367 100644
      rspec (2.14.1)
        rspec-core (~> 2.14.0)
        rspec-expectations (~> 2.14.0)
-@@ -236,7 +229,6 @@ GEM
+@@ -236,7 +226,6 @@ GEM
      whenever (0.9.2)
        activesupport (>= 2.3.4)
        chronic (>= 0.6.3)
@@ -68,7 +81,7 @@ index 5a40d60..14a5367 100644
  
  PLATFORMS
    ruby
-@@ -261,18 +253,15 @@ DEPENDENCIES
+@@ -261,18 +250,15 @@ DEPENDENCIES
    occi-core (~> 4.2.10)
    opennebula (~> 4.4.0)
    openssl_cms_1_9_3!
-- 
1.8.2.3