[packages/ruby-pkg-config] updated to 1.1.9, disabled avoid-cycle patch

[glen]

commit a535552cb7db4b86ec79ba66870e86e081429a93
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Apr 24 23:38:57 2017 +0300

    updated to 1.1.9, disabled avoid-cycle patch

 ruby-pkg-config.spec |  8 ++++----
 x32.patch            | 32 +++++++++++++++++---------------
 2 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/ruby-pkg-config.spec b/ruby-pkg-config.spec
index ae08ac5..94b304d 100644
--- a/ruby-pkg-config.spec
+++ b/ruby-pkg-config.spec
@@ -6,12 +6,12 @@
 Summary:	pkg-config module for Ruby
 Summary(pl.UTF-8):	Moduł pkg-config dla języka Ruby
 Name:		ruby-%{pkgname}
-Version:	1.1.5
-Release:	4
+Version:	1.1.9
+Release:	1
 License:	LGPL v2.1+
 Group:		Development/Languages
 Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
-# Source0-md5:	c32204c8d6f0d1cae84f6c67b3e0fd92
+# Source0-md5:	18db5b1e1cb849567e42f5c61b24eb41
 Patch0:		%{name}-avoid-cycle.patch
 Patch1:		x32.patch
 URL:		https://github.com/ruby-gnome2/pkg-config
@@ -35,7 +35,7 @@ Moduł pkg-config dla języka Ruby.
 
 %prep
 %setup -q -n %{pkgname}-%{version}
-%patch0 -p1
+#%patch0 -p1 OUTDATED? UPSTREAMED?
 %patch1 -p1
 
 %build
diff --git a/x32.patch b/x32.patch
index c1661c5..a7a1cf5 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,5 +1,7 @@
---- pkg-config-1.1.5/lib/pkg-config.rb~	2015-12-19 22:10:31.000000000 +0100
-+++ pkg-config-1.1.5/lib/pkg-config.rb	2015-12-19 22:16:52.177522169 +0100
+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}
@@ -9,20 +11,20 @@
      end
      if @msvc_syntax
        path_flags = path_flags.collect do |flag|
-@@ -283,11 +283,13 @@
-   def guess_default_path
+@@ -316,11 +316,13 @@
      arch_depended_path = Dir.glob('/usr/lib/*/pkgconfig').join(SEPARATOR)
-     default_path = ["/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/X11/lib/pkgconfig/",
-                     "/opt/X11/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,
+       "/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,
================================================================

---- gitweb:

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