From 2e246b5644b35376733e1bae80250c8aa31e4a8487ecbb2d24f9593bd6ce5ca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?=
 <vcizek@suse.com>
Date: Thu, 28 May 2015 09:05:55 +0000
Subject: [PATCH] Accepting request 308905 from home:dimstar:Factory

Fix building of libselinux-bindings: make proper use of ruby 2.2

OBS-URL: https://build.opensuse.org/request/show/308905
OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=81
---
 libselinux-2.2-ruby.patch   | 12 ++++++------
 libselinux-bindings.changes |  6 ++++++
 libselinux-bindings.spec    |  2 +-
 libselinux.spec             |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/libselinux-2.2-ruby.patch b/libselinux-2.2-ruby.patch
index 345ca3a..4ee9d20 100644
--- a/libselinux-2.2-ruby.patch
+++ b/libselinux-2.2-ruby.patch
@@ -1,19 +1,19 @@
 Index: src/Makefile
 ===================================================================
---- src/Makefile.orig	2013-01-30 13:24:55.549631752 +0100
-+++ src/Makefile	2013-01-30 13:25:56.148209843 +0100
-@@ -16,8 +16,8 @@
+--- src/Makefile.orig
++++ src/Makefile
+@@ -16,8 +16,8 @@ PYINC ?= $(shell pkg-config --cflags $(P
  PYLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
  RUBYLIBVER ?= $(shell $(RUBY) -e 'print RUBY_VERSION.split(".")[0..1].join(".")')
  RUBYPLATFORM ?= $(shell $(RUBY) -e 'print RUBY_PLATFORM')
 -RUBYINC ?= $(shell pkg-config --cflags ruby)
 -RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
-+RUBYINC ?= $(shell ruby -r rbconfig -e "print Config::CONFIG['rubyhdrdir'].nil? ? '$(LIBDIR)/ruby/$(RUBYLIBVER)' : Config::CONFIG['rubyhdrdir']")
-+RUBYINSTALL ?= $(shell ruby -r rbconfig -e "print Config::CONFIG['vendorarchdir'].nil? ? '$(DESTDIR)'+Config::CONFIG['sitearchdir'] : '$(DESTDIR)'+Config::CONFIG['vendorarchdir']")
++RUBYINC ?= $(shell ruby -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'].nil? ? '$(LIBDIR)/ruby/$(RUBYLIBVER)' : RbConfig::CONFIG['rubyhdrdir']")
++RUBYINSTALL ?= $(shell ruby -r rbconfig -e "print RbConfig::CONFIG['vendorarchdir'].nil? ? '$(DESTDIR)'+RbConfig::CONFIG['sitearchdir'] : '$(DESTDIR)'+RbConfig::CONFIG['vendorarchdir']")
  LIBBASE ?= $(shell basename $(LIBDIR))
  
  VERSION = $(shell cat ../VERSION)
-@@ -103,7 +103,7 @@ $(SWIGLOBJ): $(SWIGCOUT)
+@@ -98,7 +98,7 @@ $(SWIGLOBJ): $(SWIGCOUT)
  	$(CC) $(CFLAGS) $(SWIG_CFLAGS) $(PYINC) -fPIC -DSHARED -c -o $@ $<
  
  $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)
diff --git a/libselinux-bindings.changes b/libselinux-bindings.changes
index ecb0baa..533efff 100644
--- a/libselinux-bindings.changes
+++ b/libselinux-bindings.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 27 11:53:54 UTC 2015 - dimstar@opensuse.org
+
+- Update libselinux-2.2-ruby.patch: use RbConfig instead of
+  deprecated Config.
+
 -------------------------------------------------------------------
 Thu Oct 31 13:43:41 UTC 2013 - p.drouand@gmail.com
 
diff --git a/libselinux-bindings.spec b/libselinux-bindings.spec
index 0695fb5..26506d7 100644
--- a/libselinux-bindings.spec
+++ b/libselinux-bindings.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libselinux-bindings
 #
-# 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
diff --git a/libselinux.spec b/libselinux.spec
index 65a55c9..fc7d615 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libselinux
 #
-# 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