[DRE-commits] [ruby-grib] 06/07: Add patch: Remove git ls-files from gemspec

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository ruby-grib.

commit 2628081a62c16b258524d010ad69441383469c29
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Mon Sep 25 00:27:36 2017 +0900

    Add patch: Remove git ls-files from gemspec
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 .../0003-Use-eccodes-instead-of-grib_api.patch     | 13 ++++++---
 .../0004-Remove-git-ls-files-from-gemspec.patch    | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/debian/patches/0003-Use-eccodes-instead-of-grib_api.patch b/debian/patches/0003-Use-eccodes-instead-of-grib_api.patch
index f545451..3f61642 100644
--- a/debian/patches/0003-Use-eccodes-instead-of-grib_api.patch
+++ b/debian/patches/0003-Use-eccodes-instead-of-grib_api.patch
@@ -4,12 +4,15 @@ Subject: Use eccodes instead of grib_api
 
 Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 ---
- ext/extconf.rb | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ ext/extconf.rb           | 4 ++--
+ lib/numru/grib/setenv.rb | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
 
+diff --git a/ext/extconf.rb b/ext/extconf.rb
+index 761f2bd..1980ba3 100644
 --- a/ext/extconf.rb
 +++ b/ext/extconf.rb
-@@ -54,7 +54,7 @@
+@@ -54,7 +54,7 @@ unless have_header("narray.h")
    exit(-1)
  end
  
@@ -19,9 +22,11 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
 +if have_header("grib_api.h") && have_library("eccodes")
    create_makefile("numru/grib")
  end
+diff --git a/lib/numru/grib/setenv.rb b/lib/numru/grib/setenv.rb
+index f67c60f..3aae9cb 100644
 --- a/lib/numru/grib/setenv.rb
 +++ b/lib/numru/grib/setenv.rb
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,7 @@ if File.exist?(def_path)
      ENV[env_name] = "#{gdp}:#{def_path}"
    else
      begin
diff --git a/debian/patches/0004-Remove-git-ls-files-from-gemspec.patch b/debian/patches/0004-Remove-git-ls-files-from-gemspec.patch
new file mode 100644
index 0000000..cca8a62
--- /dev/null
+++ b/debian/patches/0004-Remove-git-ls-files-from-gemspec.patch
@@ -0,0 +1,31 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Mon, 25 Sep 2017 00:27:08 +0900
+Subject: Remove git ls-files from gemspec
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ rb-grib.gemspec | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/rb-grib.gemspec b/rb-grib.gemspec
+index 2c2f662..4a5222e 100644
+--- a/rb-grib.gemspec
++++ b/rb-grib.gemspec
+@@ -13,14 +13,13 @@ Gem::Specification.new do |s|
+ 
+   s.rubyforge_project = "rb-grib"
+ 
+-  s.files         = `git ls-files`.split("\n")
+-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
++  s.files         = ["BSDL","Gemfile","LICENSE.txt","README.rdoc","Rakefile","data/regular_gaussian_model_level.grib1","data/regular_gaussian_model_level.grib2","data/regular_gaussian_pressure_level.grib1","data/regular_gaussian_pressure_level.grib2","data/regular_gaussian_pressure_level_constant.grib1","data/regular_gaussian_pressure_level_constant.grib2","data/regular_gaussian_surface.grib1","data/regular_gaussian_surface.grib2","data/regular_latlon_surface.grib1","data/regular_latlon [...]
++  s.test_files    = ["spec/GRIB1.tmpl","spec/GRIB2.tmpl","spec/grib_read_spec.rb","spec/spec_helper.rb"]
+   s.require_paths = ["lib"]
+   s.extensions << "ext/extconf.rb"
+ 
+   # specify any dependencies here; for example:
+   s.add_development_dependency "rspec"
+-  s.add_runtime_dependency "numru-narray"
++  s.add_runtime_dependency "narray"
+   s.add_runtime_dependency "narray_miss"
+ end
diff --git a/debian/patches/series b/debian/patches/series
index 72a98ba..8c5ace8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Fix-RSpec-LOAD_PATH.patch
 0002-Fix-NArray-PATH.patch
 0003-Use-eccodes-instead-of-grib_api.patch
+0004-Remove-git-ls-files-from-gemspec.patch

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