[DRE-commits] [ruby-pkg-config] 07/19: New upstream version 1.2.1

Daisuke Higuchi dai at moszumanska.debian.org
Sat Jul 15 03:42:37 UTC 2017


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

dai pushed a commit to branch master
in repository ruby-pkg-config.

commit 4e32318952025cdf031c24a739b104dd0c78c7d0
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date:   Sat Jul 15 12:02:18 2017 +0900

    New upstream version 1.2.1
---
 .gitignore                |  3 ++
 .travis.yml               |  9 ++++++
 NEWS                      |  6 ++++
 lib/pkg-config.rb         | 10 +++++--
 lib/pkg-config/version.rb |  2 +-
 pkg-config.gemspec        | 72 +++++++++++++++++++++++------------------------
 6 files changed, 62 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1a34106
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/pkg/
+/doc/
+/Gemfile.lock
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..cebf9ae
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+rvm:
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4.1
+notifications:
+  email:
+    recipients:
+      - ruby-gnome2-cvs at lists.sourceforge.net
diff --git a/NEWS b/NEWS
index 499425f..317bfa3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 = NEWS
 
+== 1.2.1 - 2017-05-29
+
+=== Improvements
+
+  * Supported MSYS2.
+
 == 1.2.0 - 2017-04-25
 
 === Improvements
diff --git a/lib/pkg-config.rb b/lib/pkg-config.rb
index 6d0375c..cf0b017 100644
--- a/lib/pkg-config.rb
+++ b/lib/pkg-config.rb
@@ -313,14 +313,14 @@ class PackageConfig
   end
 
   def guess_default_path
-    arch_depended_path = Dir.glob('/usr/lib/*/pkgconfig').join(SEPARATOR)
+    arch_depended_path = Dir.glob("/usr/lib/*/pkgconfig")
     default_paths = [
       "/usr/local/lib64/pkgconfig",
       "/usr/local/libx32/pkgconfig",
       "/usr/local/lib/pkgconfig",
       "/usr/local/libdata/pkgconfig",
       "/opt/local/lib/pkgconfig",
-      arch_depended_path,
+      *arch_depended_path,
       "/usr/lib64/pkgconfig",
       "/usr/libx32/pkgconfig",
       "/usr/lib/pkgconfig",
@@ -329,6 +329,12 @@ class PackageConfig
       "/opt/X11/lib/pkgconfig",
       "/usr/share/pkgconfig",
     ]
+    case RUBY_PLATFORM
+    when "x86-mingw32"
+      default_paths.concat(Dir.glob("c:/msys*/mingw32/lib/pkgconfig"))
+    when "x64-mingw32"
+      default_paths.concat(Dir.glob("c:/msys*/mingw64/lib/pkgconfig"))
+    end
     default_path = default_paths.join(SEPARATOR)
     libdir = ENV["PKG_CONFIG_LIBDIR"]
     default_path = [libdir, default_path].join(SEPARATOR) if libdir
diff --git a/lib/pkg-config/version.rb b/lib/pkg-config/version.rb
index c339d8d..7f1839f 100644
--- a/lib/pkg-config/version.rb
+++ b/lib/pkg-config/version.rb
@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module PKGConfig
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end
diff --git a/pkg-config.gemspec b/pkg-config.gemspec
index 7e6b619..002500a 100644
--- a/pkg-config.gemspec
+++ b/pkg-config.gemspec
@@ -1,41 +1,39 @@
-#########################################################
-# This file has been automatically generated by gem2tgz #
-#########################################################
-# -*- encoding: utf-8 -*-
+# -*- mode: ruby; coding: utf-8 -*-
+#
+# Copyright (C) 2010-2012  Kouhei Sutou <kou at clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-Gem::Specification.new do |s|
-  s.name = "pkg-config"
-  s.version = "1.2.0"
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
+require "pkg-config/version"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Kouhei Sutou"]
-  s.date = "2017-04-24"
-  s.description = "pkg-config can be used in your extconf.rb to properly detect need libraries for compiling Ruby native extensions"
-  s.email = ["kou at cozmixng.org"]
-  s.files = ["Gemfile", "LGPL-2.1", "NEWS", "README.rdoc", "Rakefile", "lib/pkg-config.rb", "lib/pkg-config/version.rb", "test/run-test.rb", "test/test_pkg_config.rb"]
-  s.homepage = "https://github.com/ruby-gnome2/pkg-config"
-  s.licenses = ["LGPLv2+"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "cairo"
-  s.rubygems_version = "1.8.23"
-  s.summary = "A pkg-config implementation for Ruby"
-  s.test_files = ["test/run-test.rb", "test/test_pkg_config.rb"]
+Gem::Specification.new do |spec|
+  spec.name = "pkg-config"
+  spec.version = PKGConfig::VERSION
+  spec.rubyforge_project = "cairo"
+  spec.homepage = "https://github.com/ruby-gnome2/pkg-config"
+  spec.authors = ["Kouhei Sutou"]
+  spec.email = ["kou at cozmixng.org"]
+  spec.summary = 'A pkg-config implementation for Ruby'
+  spec.description = "pkg-config can be used in your extconf.rb to properly detect need libraries for compiling Ruby native extensions"
+  spec.license = "LGPLv2+"
+  spec.files = ["README.rdoc", "NEWS", "Gemfile", "Rakefile", "LGPL-2.1"]
+  spec.files += Dir.glob("lib/**/*.rb")
+  spec.test_files = Dir.glob("test/**/*.rb")
 
-  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<bundler>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<test-unit>, [">= 0"])
-    else
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<test-unit>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<test-unit>, [">= 0"])
-  end
+  spec.add_development_dependency("test-unit")
+  spec.add_development_dependency("rake")
+  spec.add_development_dependency("bundler")
 end

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



More information about the Pkg-ruby-extras-commits mailing list