From 9aec84469f0db310d75f429f532845ad639e3a49 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed, 4 Dec 2019 15:28:32 +0100
Subject: [PATCH] Update license types used and push each gem separately

    * .github/workflows/main.yml:
    * rakelib/gem.rake:
    * scripts/rake-gem.rb:
    * scripts/rake-taogem.rb:
---
 .github/workflows/main.yml |  3 ++-
 rakelib/gem.rake           | 12 ++++++------
 scripts/rake-gem.rb        |  4 ++--
 scripts/rake-taogem.rb     |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cedc2e4..ffe27b4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,6 +23,7 @@ jobs:
         printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
         rake gem
         rake r2corba:gem:taogem
-        gem push pkg/*.gem
+        gem push pkg/taosource*.gem
+        gem push pkg/r2corba*.gem
       env:
         GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
diff --git a/rakelib/gem.rake b/rakelib/gem.rake
index d797444..1d0e544 100644
--- a/rakelib/gem.rake
+++ b/rakelib/gem.rake
@@ -76,7 +76,7 @@ namespace :r2corba do
           gem.require_paths = %w{lib}
           gem.executables = []
           gem.required_ruby_version = '>= 2.0'
-          gem.licenses = ['ACE']
+          gem.licenses = ['DOC']
         end
         R2CORBA::Gem.build_gem(gemspec)
       end
@@ -97,7 +97,7 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
     gem.require_paths = %w{lib}
     gem.executables = %w{ridlc rins r2corba}
     gem.required_ruby_version = '>= 2.0'
-    gem.licenses = ['R2CORBA', 'ACE', 'GPL']
+    gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
     gem.require_paths << 'ext'
     gem.add_dependency 'ridl', '~> 2.5'
     gem.add_dependency 'rake', '~> 10.0'
@@ -136,7 +136,7 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
       gem.require_paths = %w{ext}
       gem.executables = []
       gem.required_ruby_version = '>= 2.0.0'
-      gem.licenses = ['R2CORBA', 'ACE']
+      gem.licenses = ['Nonstandard', 'DOC']
       gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so'
     end
     R2CORBA::Gem.build_gem(gemspec)
@@ -177,11 +177,11 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
       if defined?(JRUBY_VERSION)
         gem.require_paths << 'jacorb/lib'
         gem.required_ruby_version = '>= 1.7.0'
-        gem.licenses = ['R2CORBA', 'JacORB']
+        gem.licenses = ['Nonstandard', 'GPL-2.0']
       else
         gem.files << File.join('ext', '.keep') unless ENV['FULL_BINGEM'] # to force installation of ext folder if libs are left out
         gem.required_ruby_version = '>= 1.9.3'
-        gem.licenses = ['R2CORBA', 'ACE', 'GPL']
+        gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
         gem.require_paths << 'ext'
       end
       gem.add_dependency 'ridl', '~> 2.5'
@@ -214,7 +214,7 @@ unless defined?(JRUBY_VERSION) || !R2CORBA::Config.is_win32
       gem.executables = []
       gem.extensions = []
       gem.required_ruby_version = '>= 2.0'
-      gem.licenses = ['R2CORBA']
+      gem.licenses = ['Nonstandard']
     end
     R2CORBA::Gem.build_gem(gemspec)
   end
diff --git a/scripts/rake-gem.rb b/scripts/rake-gem.rb
index 3fcf2a8..e4a11e3 100644
--- a/scripts/rake-gem.rb
+++ b/scripts/rake-gem.rb
@@ -19,11 +19,11 @@
       gem.executables << 'jrins'
       gem.require_paths << 'jacorb/lib'
       gem.required_ruby_version = '>= 1.5.0'
-      gem.licenses = ['R2CORBA', 'JacORB']
+      gem.licenses = ['Nonstandard', 'GPL-2.0']
     else
       gem.platform = Gem::Platform::CURRENT if RUBY_PLATFORM =~ /mingw32/
       gem.required_ruby_version = '>= 1.8.6'
-      gem.licenses = ['R2CORBA', 'ACE', 'GPL']
+      gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
       gem.require_paths << 'ext'
     end
     gem.add_dependency 'ridl', '>= 2.2.2'
diff --git a/scripts/rake-taogem.rb b/scripts/rake-taogem.rb
index 325e447..e77a028 100644
--- a/scripts/rake-taogem.rb
+++ b/scripts/rake-taogem.rb
@@ -49,7 +49,7 @@ def self.build_gem
     gem.executables = []
     #gem.platform = Gem::Platform::CURRENT
     gem.required_ruby_version = '>= 2.0'
-    gem.licenses = ['ACE']
+    gem.licenses = ['DOC']
   end
 end