From 680bec3de613a0931e7883b9216e0ed126098f82 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Wed, 21 Mar 2018 16:24:25 +0100
Subject: [PATCH] libselinux-2.7-13

- build: Replace PYSITEDIR with PYTHONLIBDIR
---
 libselinux-fedora.patch | 12 ++++++------
 libselinux.spec         |  9 ++++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/libselinux-fedora.patch b/libselinux-fedora.patch
index 939d0df..dbb57e7 100644
--- a/libselinux-fedora.patch
+++ b/libselinux-fedora.patch
@@ -134,7 +134,7 @@ index e37aee6..bf23b65 100644
  Every confined service on the system has a man page in the following format:
  .br
 diff --git libselinux-2.7/src/Makefile libselinux-2.7/src/Makefile
-index 2408fae..18588da 100644
+index 2408fae..8af04aa 100644
 --- libselinux-2.7/src/Makefile
 +++ libselinux-2.7/src/Makefile
 @@ -8,19 +8,17 @@ RUBYPREFIX ?= $(notdir $(RUBY))
@@ -150,7 +150,7 @@ index 2408fae..18588da 100644
  PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX))
  PYLIBS ?= $(shell $(PKG_CONFIG) --libs $(PYPREFIX))
 -PYSITEDIR ?= $(DESTDIR)$(shell $(PYTHON) -c 'import site; print(site.getsitepackages()[0])')
-+PYSITEDIR ?= $(shell $(PYTHON) -c 'import site; print(site.getsitepackages()[0])')
++PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(plat_specific=1, prefix='$(PREFIX)'))")
  PYCEXT ?= $(shell $(PYTHON) -c 'import imp;print([s for s,m,t in imp.get_suffixes() if t == imp.C_EXTENSION][0])')
  RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" + RbConfig::CONFIG["rubyarchhdrdir"] + " -I" + RbConfig::CONFIG["rubyhdrdir"]')
  RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" + RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] + " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]')
@@ -217,10 +217,10 @@ index 2408fae..18588da 100644
 -	install -m 755 $(SWIGSO) $(PYSITEDIR)/_selinux$(PYCEXT)
 -	install -m 755 $(AUDIT2WHYSO) $(PYSITEDIR)/selinux/audit2why$(PYCEXT)
 -	install -m 644 $(SWIGPYOUT) $(PYSITEDIR)/selinux/__init__.py
-+	test -d $(DESTDIR)$(PYSITEDIR)/selinux || install -m 755 -d $(DESTDIR)$(PYSITEDIR)/selinux
-+	install -m 755 $(SWIGSO) $(DESTDIR)$(PYSITEDIR)/_selinux$(PYCEXT)
-+	install -m 755 $(AUDIT2WHYSO) $(DESTDIR)$(PYSITEDIR)/selinux/audit2why$(PYCEXT)
-+	install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYSITEDIR)/selinux/__init__.py
++	test -d $(DESTDIR)$(PYTHONLIBDIR)/selinux || install -m 755 -d $(DESTDIR)$(PYTHONLIBDIR)/selinux
++	install -m 755 $(SWIGSO) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT)
++	install -m 755 $(AUDIT2WHYSO) $(DESTDIR)$(PYTHONLIBDIR)/selinux/audit2why$(PYCEXT)
++	install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py
  
  install-rubywrap: rubywrap
 -	test -d $(RUBYINSTALL) || install -m 755 -d $(RUBYINSTALL) 
diff --git a/libselinux.spec b/libselinux.spec
index 5d6dc97..bbbe524 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -3,13 +3,13 @@
 %endif
 
 %define ruby_inc %(pkg-config --cflags ruby)
-%define libsepolver 2.7-5
+%define libsepolver 2.7-6
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.7
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: Public Domain
 # https://github.com/SELinuxProject/selinux/wiki/Releases
 Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804/libselinux-2.7.tar.gz
@@ -19,7 +19,7 @@ Url: https://github.com/SELinuxProject/selinux/wiki
 # download https://raw.githubusercontent.com/fedora-selinux/scripts/master/selinux/make-fedora-selinux-patch.sh
 # run:
 # $ VERSION=2.7 ./make-fedora-selinux-patch.sh libselinux
-# HEAD https://github.com/fedora-selinux/selinux/commit/4e253a0231ca085df03b55c4c0490ad6a0e261eb
+# HEAD https://github.com/fedora-selinux/selinux/commit/0a28664012ec7383cf5cbdef4ad2dbedf1f70707
 Patch1: libselinux-fedora.patch
 BuildRequires: gcc
 BuildRequires: python2 python2-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig pcre2-devel xz-devel
@@ -244,6 +244,9 @@ rm -f %{buildroot}%{_mandir}/man8/togglesebool*
 %{ruby_vendorarchdir}/selinux.so
 
 %changelog
+* Wed Mar 21 2018 Petr Lautrbach <plautrba@workstation> - 2.7-13
+- build: Replace PYSITEDIR with PYTHONLIBDIR
+
 * Tue Mar 13 2018 Petr Lautrbach <plautrba@redhat.com> - 2.7-12
 - Correct manpages regarding removable_context
 - build: follow standard semantics for DESTDIR and PREFIX