Hello community,
here is the log from the commit of package rubygem-pkg-config for
openSUSE:Factory checked in at 2015-02-10 20:22:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-pkg-config (Old)
and /work/SRC/openSUSE:Factory/.rubygem-pkg-config.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-pkg-config"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-pkg-config/rubygem-pkg-config.changes
2014-10-18 09:09:28.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.rubygem-pkg-config.new/rubygem-pkg-config.changes
2015-02-10 20:22:26.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Feb 9 06:47:33 UTC 2015 - co...@suse.com
+
+- updated to version 1.1.6
+ * Supported Ruby 2.1.
+
+-------------------------------------------------------------------
Old:
----
pkg-config-1.1.5.gem
New:
----
pkg-config-1.1.6.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-pkg-config.spec ++++++
--- /var/tmp/diff_new_pack.C0LCul/_old 2015-02-10 20:22:27.000000000 +0100
+++ /var/tmp/diff_new_pack.C0LCul/_new 2015-02-10 20:22:27.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-pkg-config
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
#
Name: rubygem-pkg-config
-Version: 1.1.5
+Version: 1.1.6
Release: 0
%define mod_name pkg-config
%define mod_full_name %{mod_name}-%{version}
@@ -32,7 +32,7 @@
BuildRequires: %{rubygem gem2rpm}
BuildRequires: %{ruby}
BuildRequires: ruby-macros >= 5
-Url: https://github.com/rcairo/pkg-config
+Url: https://github.com/ruby-gnome2/pkg-config
Source: http://rubygems.org/gems/%{mod_full_name}.gem
Source1: gem2rpm.yml
Summary: A pkg-config implementation for Ruby
++++++ pkg-config-1.1.5.gem -> pkg-config-1.1.6.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gemfile new/Gemfile
--- old/Gemfile 1970-01-01 01:00:00.000000000 +0100
+++ new/Gemfile 2014-11-12 08:29:58.000000000 +0100
@@ -1,6 +1,6 @@
# -*- mode: ruby; coding: utf-8 -*-
#
-# Copyright (C) 2011 Kouhei Sutou <k...@clear-code.com>
+# Copyright (C) 2011-2013 Kouhei Sutou <k...@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
@@ -13,8 +13,8 @@
#
# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
-source :rubygems
+source "https://rubygems.org/";
gemspec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NEWS new/NEWS
--- old/NEWS 1970-01-01 01:00:00.000000000 +0100
+++ new/NEWS 2014-11-12 08:29:58.000000000 +0100
@@ -1,5 +1,23 @@
= NEWS
+== 1.1.6 - 2014/11/12
+
+ * Supported Ruby 2.1.
+ [GitHub:ruby-gnome2/ruby-gnome2#262][Reported by Steve Wills]
+
+=== Thanks
+
+ * Steve Wills
+
+== 1.1.5 - 2013/12/29
+
+ * Supported XQuartz.
+ [GitHub:#10][Patch by Masafumi Yokoyama]
+
+=== Thanks
+
+ * Masafumi Yokoyama
+
== 1.1.4 - 2012/08/02
* Supported mswin64 as MSVC environment.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/README.rdoc new/README.rdoc
--- old/README.rdoc 1970-01-01 01:00:00.000000000 +0100
+++ new/README.rdoc 2014-11-12 08:29:58.000000000 +0100
@@ -47,7 +47,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
See LGPL-2.1 file for details.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Rakefile new/Rakefile
--- old/Rakefile 1970-01-01 01:00:00.000000000 +0100
+++ new/Rakefile 2014-11-12 08:29:58.000000000 +0100
@@ -14,7 +14,7 @@
#
# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
task :default => :test
Files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/pkg-config/version.rb
new/lib/pkg-config/version.rb
--- old/lib/pkg-config/version.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/pkg-config/version.rb 2014-11-12 08:29:58.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright 2012 Kouhei Sutou <k...@cozmixng.org>
+# Copyright 2012-2013 Kouhei Sutou <k...@cozmixng.org>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -12,8 +12,8 @@
#
# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
module PKGConfig
- VERSION = "1.1.5"
+ VERSION = "1.1.6"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/pkg-config.rb new/lib/pkg-config.rb
--- old/lib/pkg-config.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/pkg-config.rb 2014-11-12 08:29:58.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Kouhei Sutou <k...@cozmixng.org>
+# Copyright 2008-2013 Kouhei Sutou <k...@cozmixng.org>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -12,7 +12,7 @@
#
# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
begin
require "pkg-config/version"
@@ -90,7 +90,11 @@
rescue DL::DLError
return nil
end
- extern "const char *dln_find_exe(const char *, const char *)"
+ begin
+ extern "const char *dln_find_exe(const char *, const char *)"
+ rescue DL::DLError
+ return nil
+ end
end
path = dln.dln_find_exe(pkg_config.to_s, nil)
if path.nil? or path.size.zero?
@@ -192,12 +196,13 @@
private
def collect_cflags
- all_cflags = all_required_packages.collect do |package|
+ cflags_set = [declaration("Cflags")]
+ cflags_set += all_required_packages.collect do |package|
self.class.new(package, @options).cflags
end
- all_cflags = [declaration("Cflags")] + all_cflags
- all_cflags = all_cflags.join(" ").gsub(/-I /, '-I').split.uniq
+ all_cflags = normalize_cflags(Shellwords.split(cflags_set.join(" ")))
path_flags, other_flags = all_cflags.partition {|flag| /\A-I/ =~ flag}
+ path_flags = remove_duplicated_include_paths(path_flags)
path_flags = path_flags.reject do |flag|
flag == "-I/usr/include"
end
@@ -209,6 +214,27 @@
[path_flags, other_flags]
end
+ def normalize_cflags(cflags)
+ normalized_cflags = []
+ enumerator = cflags.to_enum
+ begin
+ loop do
+ cflag = enumerator.next
+ normalized_cflags << cflag
+ case cflag
+ when "-I"
+ normalized_cflags << enumerator.next
+ end
+ end
+ rescue StopIteration
+ end
+ normalized_cflags
+ end
+
+ def remove_duplicated_include_paths(path_flags)
+ path_flags.uniq
+ end
+
def collect_libs
all_libs = required_packages.collect do |package|
self.class.new(package, @options).libs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 1970-01-01 01:00:00.000000000 +0100
+++ new/metadata 2014-11-12 08:29:58.000000000 +0100
@@ -1,69 +1,55 @@
--- !ruby/object:Gem::Specification
name: pkg-config
version: !ruby/object:Gem::Version
- version: 1.1.5
+ version: 1.1.6
platform: ruby
authors:
- Kouhei Sutou
autorequire:
bindir: bin
cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: test-unit
requirement: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: '0'
type: :development
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - - '>='
- - !ruby/object:Gem::Version
- version: '0'
-- !ruby/object:Gem::Dependency
- name: test-unit-notify
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - '>='
- - !ruby/object:Gem::Version
- version: '0'
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: '0'
- !ruby/object:Gem::Dependency
name: rake
requirement: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: '0'
type: :development
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: '0'
- !ruby/object:Gem::Dependency
name: bundler
requirement: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: '0'
type: :development
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: '0'
description: pkg-config can be used in your extconf.rb to properly detect need
libraries
@@ -74,16 +60,16 @@
extensions: []
extra_rdoc_files: []
files:
-- README.rdoc
-- NEWS
- Gemfile
-- Rakefile
- LGPL-2.1
-- lib/pkg-config/version.rb
+- NEWS
+- README.rdoc
+- Rakefile
- lib/pkg-config.rb
-- test/test_pkg_config.rb
+- lib/pkg-config/version.rb
- test/run-test.rb
-homepage: https://github.com/rcairo/pkg-config
+- test/test_pkg_config.rb
+homepage: https://github.com/ruby-gnome2/pkg-config
licenses:
- LGPLv2+
metadata: {}
@@ -93,21 +79,20 @@
- lib
required_ruby_version: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: '0'
required_rubygems_version: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: '0'
requirements: []
rubyforge_project: cairo
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
signing_key:
specification_version: 4
summary: A pkg-config implementation for Ruby
test_files:
- test/test_pkg_config.rb
- test/run-test.rb
-has_rdoc:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/test/run-test.rb new/test/run-test.rb
--- old/test/run-test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/test/run-test.rb 2014-11-12 08:29:58.000000000 +0100
@@ -12,10 +12,5 @@
require 'test-unit'
$LOAD_PATH.unshift(lib_dir)
-$LOAD_PATH.unshift(test_dir)
-Dir.glob("test/**/test_*.rb") do |file|
- require file.gsub(/(?:^test\/|\.rb$)/, '')
-end
-
-exit Test::Unit::AutoRunner.run(false)
+exit Test::Unit::AutoRunner.run(true)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
