From 27eeabf4c9a4916adf5a42554bfa451034653167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xu=C3=A2n=20Baldauf?=
 <xuan--2016--json--xb--github.com@software.baldauf.org>
Date: Mon, 27 Mar 2017 19:57:40 +0200
Subject: Back-out change of directory of json-java.gemspec.

---
 Gemfile           |  2 +-
 Rakefile          |  2 +-
 java/json.gemspec | 42 ------------------------------------------
 json-java.gemspec | 38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 44 deletions(-)
 delete mode 100644 java/json.gemspec
 create mode 100644 json-java.gemspec

diff --git a/Gemfile b/Gemfile
index 747bc71..64f98d6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 case ENV['JSON']
 when 'ext', nil
   if ENV['RUBY_ENGINE'] == 'jruby'
-    gemspec :name => 'json', :path => 'java'
+    gemspec :name => 'json-java'
   else
     gemspec :name => 'json'
   end
diff --git a/Rakefile b/Rakefile
index 017d14a..c6c195f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -251,7 +251,7 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
 
   desc "Package the jruby gem"
   task :jruby_gem => :create_jar do
-    sh 'gem build java/json.gemspec'
+    sh 'gem build json-java.gemspec'
     mkdir_p 'pkg'
     mv "json-#{PKG_VERSION}-java.gem", 'pkg'
   end
diff --git a/java/json.gemspec b/java/json.gemspec
deleted file mode 100644
index e0e4efe..0000000
--- a/java/json.gemspec
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env jruby
-require "rubygems"
-
-spec = Gem::Specification.new do |s|
-  s.name = "json"
-  s.version = if File.exist?('VERSION')
-                File.read("VERSION").chomp 
-              else
-                File.read("../VERSION").chomp 
-              end
-  s.summary = "JSON implementation for JRuby"
-  s.description = "A JSON implementation as a JRuby extension."
-  s.author = "Daniel Luz"
-  s.email = "dev+ruby@mernen.com"
-  s.homepage = "http://json-jruby.rubyforge.org/"
-  s.platform = 'java'
-  s.rubyforge_project = "json-jruby"
-  s.licenses = ["Ruby"]
-
-  s.files = Dir["{docs,lib,tests}/**/*"]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<test-unit>, ["~> 2.0"])
-    else
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<test-unit>, ["~> 2.0"])
-    end
-  else
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<test-unit>, ["~> 2.0"])
-  end
-end
-
-if $0 == __FILE__
-  Gem::Builder.new(spec).build
-else
-  spec
-end
diff --git a/json-java.gemspec b/json-java.gemspec
new file mode 100644
index 0000000..1524b1f
--- /dev/null
+++ b/json-java.gemspec
@@ -0,0 +1,38 @@
+#!/usr/bin/env jruby
+require "rubygems"
+
+spec = Gem::Specification.new do |s|
+  s.name = "json"
+  s.version = File.read("VERSION").chomp
+  s.summary = "JSON implementation for JRuby"
+  s.description = "A JSON implementation as a JRuby extension."
+  s.author = "Daniel Luz"
+  s.email = "dev+ruby@mernen.com"
+  s.homepage = "http://json-jruby.rubyforge.org/"
+  s.platform = 'java'
+  s.rubyforge_project = "json-jruby"
+  s.licenses = ["Ruby"]
+
+  s.files = Dir["{docs,lib,tests}/**/*"]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<test-unit>, ["~> 2.0"])
+    else
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<test-unit>, ["~> 2.0"])
+    end
+  else
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<test-unit>, ["~> 2.0"])
+  end
+end
+
+if $0 == __FILE__
+  Gem::Builder.new(spec).build
+else
+  spec
+end
-- 
cgit v1.2.1