diff --git a/libselinux-ruby.patch b/libselinux-ruby.patch index 151e6c9..164db8f 100644 --- a/libselinux-ruby.patch +++ b/libselinux-ruby.patch @@ -1,7 +1,9 @@ ---- ./src/Makefile.orig 2012-06-04 08:20:19.000000000 +0000 -+++ ./src/Makefile 2012-06-04 09:43:23.000000000 +0000 -@@ -15,8 +15,8 @@ PYTHONLIBDIR ?= $(shell pkg-config --lib - PYLIBDIR ?= $(LIBDIR)/$(PYLIBVER) +Index: src/Makefile +=================================================================== +--- src/Makefile.orig 2010-12-20 21:13:33.000000000 +0100 ++++ src/Makefile 2012-06-11 11:17:42.465960993 +0200 +@@ -9,8 +9,8 @@ PYLIB ?= /usr/lib/$(PYLIBVER) + PYTHONLIBDIR ?= $(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) @@ -11,12 +13,12 @@ LIBBASE=$(shell basename $(LIBDIR)) VERSION = $(shell cat ../VERSION) -@@ -76,7 +76,7 @@ $(SWIGLOBJ): $(SWIGCOUT) - $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $< +@@ -73,7 +73,7 @@ $(SWIGLOBJ): $(SWIGCOUT) + $(CC) $(filter-out -Werror,$(CFLAGS)) -I$(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) $(PYTHONLIBDIR) -Wl,-soname,$@,-z,defs + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@ diff --git a/libselinux.spec b/libselinux.spec index 645f4b6..aea768b 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -164,7 +164,6 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/selinuxconlist %{_sbindir}/selinuxdefcon %{_sbindir}/selinuxenabled -%{_sbindir}/selinuxexeccon %{_sbindir}/setenforce %{_sbindir}/togglesebool %{_sbindir}/selinux-ready