From 80abb8133f0f6da8e94ee0cc566abd626c3329f9dff509d8486d9b79af69250f Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 25 Jul 2012 11:46:17 +0000
Subject: [PATCH] refreshed patch

OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=51
---
 libselinux-ruby.patch | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/libselinux-ruby.patch b/libselinux-ruby.patch
index d87b4b9..ba01a31 100644
--- a/libselinux-ruby.patch
+++ b/libselinux-ruby.patch
@@ -1,24 +1,24 @@
 Index: src/Makefile
 ===================================================================
---- src/Makefile.orig	2010-02-24 20:05:41.000000000 +0100
-+++ src/Makefile	2012-06-13 10:56:04.477254689 +0200
-@@ -9,8 +9,8 @@ PYLIB ?= /usr/lib/$(PYLIBVER)
- PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
+--- src/Makefile.orig
++++ src/Makefile
+@@ -15,8 +15,8 @@ PYTHONLIBDIR ?= $(shell pkg-config --lib
+ PYLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
  RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")')
  RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM')
 -RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
 -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']")
+ LIBBASE=$(shell basename $(LIBDIR))
  
  VERSION = $(shell cat ../VERSION)
- LIBVERSION = 1
-@@ -72,7 +72,7 @@ $(SWIGLOBJ): $(SWIGCOUT)
- 	$(CC) $(filter-out -Werror,$(CFLAGS)) -I$(PYINC) -fPIC -DSHARED -c -o $@ $<
+@@ -76,7 +76,7 @@ $(SWIGLOBJ): $(SWIGCOUT)
+ 	$(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $<
  
  $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)
--	$(CC) $(filter-out -Werror,$(CFLAGS)) -I$(RUBYINC) -fPIC -DSHARED -c -o $@ $<
-+	$(CC) $(filter-out -Werror,$(CFLAGS)) -I$(RUBYINC) -I$(RUBYINC)/$(RUBYPLATFORM) -fPIC -DSHARED -c -o $@ $<
+-	$(CC) $(filter-out -Werror, $(CFLAGS)) -I$(RUBYINC) -fPIC -DSHARED -c -o $@ $<
++	$(CC) $(filter-out -Werror, $(CFLAGS)) -I$(RUBYINC) -I$(RUBYINC)/$(RUBYPLATFORM) -fPIC -DSHARED -c -o $@ $<
  
  $(SWIGSO): $(SWIGLOBJ)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) $(PYTHONLIBDIR) -Wl,-soname,$@,-z,defs