[DRE-commits] [ruby-pkg-config] 11/19: New upstream version 1.2.3
Daisuke Higuchi
dai at moszumanska.debian.org
Sat Jul 15 03:42:38 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 9b4ff7caeacf9f5dd8e621d13673f85f67b45930
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date: Sat Jul 15 12:02:34 2017 +0900
New upstream version 1.2.3
---
.gitignore | 3 --
.travis.yml | 9 ------
NEWS | 6 ++++
lib/pkg-config.rb | 19 +++++++------
lib/pkg-config/version.rb | 2 +-
pkg-config.gemspec | 72 ++++++++++++++++++++++++-----------------------
6 files changed, 54 insertions(+), 57 deletions(-)
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 1a34106..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/pkg/
-/doc/
-/Gemfile.lock
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index cebf9ae..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-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 d20401d..022e177 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
= NEWS
+== 1.2.3 - 2017-05-29
+
+=== Fixes
+
+ * Supported *-mingw32 Rubies without MSYS2 again.
+
== 1.2.2 - 2017-05-29
=== Improvements
diff --git a/lib/pkg-config.rb b/lib/pkg-config.rb
index 60511f0..d048bf0 100644
--- a/lib/pkg-config.rb
+++ b/lib/pkg-config.rb
@@ -226,20 +226,21 @@ class PackageConfig
[path_flags, other_flags]
end
- def normalize_path_flags(path_flags, prefix)
+ def normalize_path_flags(path_flags, flag_option)
path_flags.collect do |path_flag|
- path = path_flag.sub(prefix, "")
+ path = path_flag.sub(flag_option, "")
+ prefix = ""
case RUBY_PLATFORM
when "x86-mingw32"
- unless /\A[a-z]:/i === path
- path = Dir.glob("c:/msys{32,64,*}").first + path
- end
+ prefix = Dir.glob("c:/msys{32,64,*}").first
when "x64-mingw32"
- unless /\A[a-z]:/i === path
- path = Dir.glob("c:/msys{64,*}").first + path
- end
+ prefix = Dir.glob("c:/msys{64,*}").first
+ end
+ if /\A[a-z]:/i === path
+ "#{flag_option}#{path}"
+ else
+ "#{flag_option}#{prefix}#{path}"
end
- "#{prefix}#{path}"
end
end
diff --git a/lib/pkg-config/version.rb b/lib/pkg-config/version.rb
index 797d747..84a7380 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.2"
+ VERSION = "1.2.3"
end
diff --git a/pkg-config.gemspec b/pkg-config.gemspec
index 002500a..ac7169c 100644
--- a/pkg-config.gemspec
+++ b/pkg-config.gemspec
@@ -1,39 +1,41 @@
-# -*- 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
+#########################################################
+# This file has been automatically generated by gem2tgz #
+#########################################################
+# -*- encoding: utf-8 -*-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
-require "pkg-config/version"
+Gem::Specification.new do |s|
+ s.name = "pkg-config"
+ s.version = "1.2.3"
-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")
+ s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+ s.authors = ["Kouhei Sutou"]
+ s.date = "2017-05-29"
+ 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"]
- spec.add_development_dependency("test-unit")
- spec.add_development_dependency("rake")
- spec.add_development_dependency("bundler")
+ 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
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