[DRE-commits] [ruby-roxml] 10/12: Add 0005-No-require_relative-to-load-roxml.patch

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-roxml.

commit 65fe49337014d636c8ffa741c24ee281fc1b320f
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Dec 4 22:40:30 2017 +0100

    Add 0005-No-require_relative-to-load-roxml.patch
---
 .../0005-No-require_relative-to-load-roxml.patch   | 57 ++++++++++++++++++++++
 debian/patches/require-rspec.patch                 |  4 +-
 debian/patches/series                              |  1 +
 3 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0005-No-require_relative-to-load-roxml.patch b/debian/patches/0005-No-require_relative-to-load-roxml.patch
new file mode 100644
index 0000000..592c16d
--- /dev/null
+++ b/debian/patches/0005-No-require_relative-to-load-roxml.patch
@@ -0,0 +1,57 @@
+From: =?utf-8?q?C=C3=A9dric_Boutillier?= <boutil at debian.org>
+Date: Mon, 4 Dec 2017 21:48:45 +0100
+Subject: No require_relative to load roxml
+
+---
+ spec/spec_helper.rb        | 2 +-
+ test/mocks/dictionaries.rb | 4 ++--
+ test/mocks/mocks.rb        | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 74a46e6..2865eca 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -5,7 +5,7 @@ require 'ostruct'
+ require 'rspec/matchers' # req by equivalent-xml custom matcher `be_equivalent_to`
+ 
+ require_relative './../test/support/fixtures'
+-require_relative '../lib/roxml'
++require 'roxml'
+ require_relative './shared_specs'
+ 
+ def xml_for(name)
+diff --git a/test/mocks/dictionaries.rb b/test/mocks/dictionaries.rb
+index fc1fe67..fa07154 100644
+--- a/test/mocks/dictionaries.rb
++++ b/test/mocks/dictionaries.rb
+@@ -1,4 +1,4 @@
+-require_relative "./../../lib/roxml"
++require "roxml"
+ 
+ class DictionaryOfAttrs
+   include ROXML
+@@ -54,4 +54,4 @@ class DictionaryOfAttrNameClashes
+   xml_name :dictionary
+   xml_reader :definitions, :as => {:key => '@name',
+                             :value => 'content'}, :from => :definition
+-end
+\ No newline at end of file
++end
+diff --git a/test/mocks/mocks.rb b/test/mocks/mocks.rb
+index 1121f34..b70a6b8 100644
+--- a/test/mocks/mocks.rb
++++ b/test/mocks/mocks.rb
+@@ -1,4 +1,4 @@
+-require_relative "./../../lib/roxml"
++require "roxml"
+ 
+ class Muffins
+   include ROXML
+@@ -276,4 +276,4 @@ class PersonWithMotherOrMissing
+   xml_reader :age, :from => :attr, :else => 21
+   xml_reader :name, :else => 'Anonymous'
+   xml_reader :mother,:as => PersonWithMotherOrMissing, :else => Person.blank
+-end
+\ No newline at end of file
++end
diff --git a/debian/patches/require-rspec.patch b/debian/patches/require-rspec.patch
index 407667b..63d7ce4 100644
--- a/debian/patches/require-rspec.patch
+++ b/debian/patches/require-rspec.patch
@@ -8,7 +8,7 @@ Subject: require-rspec
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index f2dc594..57ec485 100644
+index f2dc594..651e368 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
 @@ -6,7 +6,7 @@ require 'rspec/matchers' # req by equivalent-xml custom matcher `be_equivalent_t
@@ -16,7 +16,7 @@ index f2dc594..57ec485 100644
  
  require_relative './../test/support/fixtures'
 -require_relative './../lib/roxml'
-+require 'roxml'
++require_relative '../lib/roxml'
  require_relative './shared_specs'
  
  def xml_for(name)
diff --git a/debian/patches/series b/debian/patches/series
index d89dea6..17be62c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ deactivate_activesupport_gem_version_test.patch
 require-rspec.patch
 use_moved_VERSION.patch
 0004-Do-not-require-equivalent-xml-gem-for-tests.patch
+0005-No-require_relative-to-load-roxml.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-roxml.git