From 53616ca4478fe48987cfa4264edbde3d8b7a59cfd78c3d0f0f4b24dbe8dc8a22 Mon Sep 17 00:00:00 2001
From: Johannes Segitz <jsegitz@suse.com>
Date: Thu, 18 Mar 2021 10:06:40 +0000
Subject: [PATCH] Accepting request 879845 from
 home:jsegitz:branches:security:SELinux

- Link to correct so version
- Minor spec file cleanups

- Minor spec file cleanups

OBS-URL: https://build.opensuse.org/request/show/879845
OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libsemanage?expand=0&rev=90
---
 libsemanage.changes     |  6 ++++++
 libsemanage.spec        | 13 +++++++------
 python-semanage.changes |  5 +++++
 python-semanage.spec    |  9 +++++----
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/libsemanage.changes b/libsemanage.changes
index 06d3ccf..0fae926 100644
--- a/libsemanage.changes
+++ b/libsemanage.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 18 08:31:30 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
+
+- Link to correct so version
+- Minor spec file cleanups
+
 -------------------------------------------------------------------
 Wed Mar 17 08:29:15 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
 
diff --git a/libsemanage.spec b/libsemanage.spec
index 2b32621..edc89a7 100644
--- a/libsemanage.spec
+++ b/libsemanage.spec
@@ -16,7 +16,8 @@
 #
 
 
-%define libname libsemanage2
+%define soversion 2
+%define libname libsemanage%{soversion}
 
 Name:           libsemanage
 Version:        3.2
@@ -39,7 +40,7 @@ BuildRequires:  libbz2-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  libsepol-devel
 BuildRequires:  libustr-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 
 %description
 libsemanage is the policy management library. Using libsepol and
@@ -111,9 +112,9 @@ grep /usr/libexec . -rl | xargs sed -i "s|/usr/libexec|%{_libexecdir}|g"
 
 %build
 %define _lto_cflags %{nil}
-make %{?_smp_mflags} clean
-make -j1 CFLAGS="%{optflags} -fno-semantic-interposition" CC="gcc"
-make -j1 CFLAGS="%{optflags} -fno-semantic-interposition" LIBDIR="%{_libdir}" LIBEXECDIR="%{_libexecdir}" SHLIBDIR="%{_lib}" CC="gcc" all
+%make_build clean
+%make_build CFLAGS="%{optflags} -fno-semantic-interposition" CC="gcc"
+%make_build CFLAGS="%{optflags} -fno-semantic-interposition" LIBDIR="%{_libdir}" LIBEXECDIR="%{_libexecdir}" SHLIBDIR="%{_lib}" CC="gcc" all
 
 %install
 mkdir -p %{buildroot}/%{_lib}
@@ -121,7 +122,7 @@ mkdir -p %{buildroot}%{_libdir}
 mkdir -p %{buildroot}%{_includedir}
 mkdir -p %{buildroot}%{_localstatedir}/lib/selinux
 %make_install LIBDIR="%{_libdir}" LIBEXECDIR="%{_libexecdir}" SHLIBDIR="%{_libdir}"
-ln -sf  %{_libdir}/libsemanage.so.1 %{buildroot}/%{_libdir}/libsemanage.so
+ln -sf  %{_libdir}/libsemanage.so.%{soversion} %{buildroot}/%{_libdir}/libsemanage.so
 cp %{SOURCE2} %{buildroot}%{_sysconfdir}/selinux/semanage.conf
 # Remove duplicate files
 %fdupes -s %{buildroot}%{_mandir}
diff --git a/python-semanage.changes b/python-semanage.changes
index 740f85d..47cb881 100644
--- a/python-semanage.changes
+++ b/python-semanage.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 18 08:31:30 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
+
+- Minor spec file cleanups
+
 -------------------------------------------------------------------
 Tue Mar  9 09:09:18 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
 
diff --git a/python-semanage.spec b/python-semanage.spec
index 47431f8..292bcc7 100644
--- a/python-semanage.spec
+++ b/python-semanage.spec
@@ -16,7 +16,8 @@
 #
 
 
-%define libname libsemanage2
+%define soversion 2
+%define libname libsemanage%{soversion}
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-semanage
@@ -56,10 +57,10 @@ grep /usr/libexec . -rl | xargs sed -i "s|/usr/libexec|%{_libexecdir}|g"
 
 %build
 %define _lto_cflags %{nil}
-make %{?_smp_mflags} clean
+%make_build clean
 %{python_expand # loop over possible pythons
-make -j1 PYTHON=$python CFLAGS="%{optflags} -fno-semantic-interposition" swigify
-make -j1 PYTHON=$python CFLAGS="%{optflags} -fno-semantic-interposition" \
+%make_build PYTHON=$python CFLAGS="%{optflags} -fno-semantic-interposition" swigify
+%make_build PYTHON=$python CFLAGS="%{optflags} -fno-semantic-interposition" \
          LIBDIR="%{_libdir}" \
          LIBEXECDIR="%{_libexecdir}" \
          SHLIBDIR="%{_lib}" \