[packages/ruby-pkg-config] - fix for x32 dirs - rel 4

[baggins]

commit c873f409bd6efb5da47ce4d0a489e31d52b6a09b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Dec 19 22:18:11 2015 +0100

    - fix for x32 dirs
    - rel 4

 ruby-pkg-config.spec |  4 +++-
 x32.patch            | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
---
diff --git a/ruby-pkg-config.spec b/ruby-pkg-config.spec
index 2ebd38a..ae08ac5 100644
--- a/ruby-pkg-config.spec
+++ b/ruby-pkg-config.spec
@@ -7,12 +7,13 @@ 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:	3
+Release:	4
 License:	LGPL v2.1+
 Group:		Development/Languages
 Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
 # Source0-md5:	c32204c8d6f0d1cae84f6c67b3e0fd92
 Patch0:		%{name}-avoid-cycle.patch
+Patch1:		x32.patch
 URL:		https://github.com/ruby-gnome2/pkg-config
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-rubyprov
@@ -35,6 +36,7 @@ Moduł pkg-config dla języka Ruby.
 %prep
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 # write .gemspec
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..c1661c5
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,33 @@
+--- 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
+@@ -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|
+@@ -283,11 +283,13 @@
+   def guess_default_path
+     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/",
+@@ -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/c873f409bd6efb5da47ce4d0a489e31d52b6a09b