[packages/ruby-pkg-config] up to 1.2.0

[glen]

commit bfe7e797da2cb23572824c566ce293c5b9cbcbb3
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Apr 25 22:19:46 2017 +0300

    up to 1.2.0
    
    x32.patch upstreamed
    https://github.com/ruby-gnome2/pkg-config/pull/12

 ruby-pkg-config.spec |  6 ++----
 x32.patch            | 35 -----------------------------------
 2 files changed, 2 insertions(+), 39 deletions(-)
---
diff --git a/ruby-pkg-config.spec b/ruby-pkg-config.spec
index 94b304d..a19c27d 100644
--- a/ruby-pkg-config.spec
+++ b/ruby-pkg-config.spec
@@ -6,14 +6,13 @@
 Summary:	pkg-config module for Ruby
 Summary(pl.UTF-8):	Moduł pkg-config dla języka Ruby
 Name:		ruby-%{pkgname}
-Version:	1.1.9
+Version:	1.2.0
 Release:	1
 License:	LGPL v2.1+
 Group:		Development/Languages
 Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
-# Source0-md5:	18db5b1e1cb849567e42f5c61b24eb41
+# Source0-md5:	02fe48b71ffd9e03da9083bbe177dd22
 Patch0:		%{name}-avoid-cycle.patch
-Patch1:		x32.patch
 URL:		https://github.com/ruby-gnome2/pkg-config
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-rubyprov
@@ -36,7 +35,6 @@ Moduł pkg-config dla języka Ruby.
 %prep
 %setup -q -n %{pkgname}-%{version}
 #%patch0 -p1 OUTDATED? UPSTREAMED?
-%patch1 -p1
 
 %build
 # write .gemspec
diff --git a/x32.patch b/x32.patch
deleted file mode 100644
index a7a1cf5..0000000
--- a/x32.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-upstream: https://github.com/ruby-gnome2/pkg-config/pull/12
-
---- pkg-config-1.1.9/lib/pkg-config.rb~	2017-04-24 23:35:09.000000000 +0300
-+++ pkg-config-1.1.9/lib/pkg-config.rb	2017-04-24 23:36:14.496058353 +0300
-@@ -222,7 +222,7 @@
-     all_libs = all_libs.join(" ").gsub(/-([Ll]) /, '\1').split.uniq
-     path_flags, other_flags = all_libs.partition {|flag| /\A-L/ =~ flag}
-     path_flags = path_flags.reject do |flag|
--      /\A-L\/usr\/lib(?:64)?\z/ =~ flag
-+      /\A-L\/usr\/lib(?:64|x32)?\z/ =~ flag
-     end
-     if @msvc_syntax
-       path_flags = path_flags.collect do |flag|
-@@ -316,11 +316,13 @@
-     arch_depended_path = Dir.glob('/usr/lib/*/pkgconfig').join(SEPARATOR)
-     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,
-       "/usr/lib64/pkgconfig",
-+      "/usr/libx32/pkgconfig",
-       "/usr/lib/pkgconfig",
-       "/usr/libdata/pkgconfig",
-       "/usr/X11/lib/pkgconfig",
-@@ -302,6 +304,7 @@
-       Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s).join(SEPARATOR)
-     [pkg_config_arch_depended_path,
-      (pkg_config_prefix + "lib64/pkgconfig").to_s,
-+     (pkg_config_prefix + "libx32/pkgconfig").to_s,
-      (pkg_config_prefix + "lib/pkgconfig").to_s,
-      (pkg_config_prefix + "libdata/pkgconfig").to_s,
-      default_path].join(SEPARATOR)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby-pkg-config.git/commitdiff/bfe7e797da2cb23572824c566ce293c5b9cbcbb3