From c6afe434d2d52a9f0c0a77c9fc92804fbd72113fb2f1fc80f8b3d8b4e1173785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 8 Nov 2018 11:21:37 +0000 Subject: [PATCH] Accepting request 647269 from home:jengelh:branches:security:SELinux Use more %make_install. OBS-URL: https://build.opensuse.org/request/show/647269 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libsemanage?expand=0&rev=68 --- libsemanage.changes | 5 +++++ libsemanage.spec | 4 ++-- python-semanage.changes | 5 +++++ python-semanage.spec | 7 +++---- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/libsemanage.changes b/libsemanage.changes index 83a4573..e3d9f3b 100644 --- a/libsemanage.changes +++ b/libsemanage.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 8 09:31:42 UTC 2018 - Jan Engelhardt + +- Use more %make_install. + ------------------------------------------------------------------- Thu Nov 8 07:19:24 UTC 2018 - jsegitz@suse.com diff --git a/libsemanage.spec b/libsemanage.spec index c976797..92cdd7e 100644 --- a/libsemanage.spec +++ b/libsemanage.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -102,7 +102,7 @@ make -j1 CFLAGS="%{optflags}" LIBDIR="%{_libdir}" LIBEXECDIR="%{_libexecdir}" SH mkdir -p %{buildroot}/%{_lib} mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{_includedir} -make DESTDIR=%{buildroot} LIBDIR="%{_libdir}" LIBEXECDIR="%{_libexecdir}" SHLIBDIR="%{_libdir}" install +%make_install LIBDIR="%{_libdir}" LIBEXECDIR="%{_libexecdir}" SHLIBDIR="%{_libdir}" ln -sf %{_libdir}/libsemanage.so.1 %{buildroot}/%{_libdir}/libsemanage.so cp %{SOURCE2} %{buildroot}%{_sysconfdir}/selinux/semanage.conf # Remove duplicate files diff --git a/python-semanage.changes b/python-semanage.changes index 987ecf4..0f3b957 100644 --- a/python-semanage.changes +++ b/python-semanage.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 8 09:31:42 UTC 2018 - Jan Engelhardt + +- Use more %make_install. + ------------------------------------------------------------------- Thu Nov 8 07:19:24 UTC 2018 - jsegitz@suse.com diff --git a/python-semanage.spec b/python-semanage.spec index fbdf606..b5873d3 100644 --- a/python-semanage.spec +++ b/python-semanage.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -65,11 +65,10 @@ mkdir -p %{buildroot}/%{_lib} mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{_includedir} %{python_expand # loop over possible pythons -make PYTHON=$python DESTDIR=%{buildroot} \ +%make_install install-pywrap PYTHON="$python" \ LIBDIR="%{_libdir}" \ LIBEXECDIR="%{_libexecdir}" \ - SHLIBDIR="%{_libdir}" \ - install install-pywrap + SHLIBDIR="%{_libdir}" } # remove files contained in other packages