Hello community, here is the log from the commit of package audit for openSUSE:Factory checked in at 2018-01-26 13:33:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audit (Old) and /work/SRC/openSUSE:Factory/.audit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "audit" Fri Jan 26 13:33:24 2018 rev:85 rq:567005 version:2.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/audit/audit-secondary.changes 2017-11-15 16:49:25.546443358 +0100 +++ /work/SRC/openSUSE:Factory/.audit.new/audit-secondary.changes 2018-01-26 13:33:25.518317199 +0100 @@ -1,0 +2,6 @@ +Wed Jan 17 15:25:55 UTC 2018 - [email protected] + +- Add conditions around python plugins to allow us to conditionalize + them in enviroment without python2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audit-secondary.spec ++++++ --- /var/tmp/diff_new_pack.ArBlNv/_old 2018-01-26 13:33:26.270282075 +0100 +++ /var/tmp/diff_new_pack.ArBlNv/_new 2018-01-26 13:33:26.278281701 +0100 @@ -1,7 +1,7 @@ # # spec file for package audit-secondary # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,8 @@ # +%bcond_without python2 +%bcond_without python3 # This package contains all audit functionality except for audit-libs. # The seperation is required to minimize unnecessary build cycles. %define _name audit @@ -38,8 +40,12 @@ BuildRequires: libtool BuildRequires: openldap2-devel BuildRequires: pkgconfig +%if %{with python2} BuildRequires: python2-devel +%endif +%if %{with python3} BuildRequires: python3-devel +%endif BuildRequires: swig BuildRequires: systemd-rpm-macros BuildRequires: tcpd-devel @@ -144,10 +150,8 @@ # https://lists.fedoraproject.org/pipermail/devel/2012-June/169411.html rm -rf %{buildroot}%{_libexecdir}/audit # Clean up some unneeded library files -for ver in %{py_ver} %{py3_ver}; do - rm -f %{buildroot}/%{_libdir}/python${ver}/site-packages/{_audit,_auparse,auparse}.{a,la} - rm -rf %{buildroot}/%{_libdir}/python${ver}/site-packages/__pycache__ -done +rm -f %{buildroot}/%{_libdir}/python*/site-packages/{_audit,_auparse,auparse}.{a,la} +rm -rf %{buildroot}/%{_libdir}/python*/site-packages/__pycache__ # cleanup makefiles for the rules (installed by %%docs command) rm -f %{buildroot}/%{_libdir}/pkgconfig/{audit,auparse}.pc # cleanup files handled by audit.spec @@ -246,15 +250,19 @@ %{_unitdir}/auditd.service %{_sbindir}/rcauditd +%if %{with python2} %files -n python2-audit -%attr(755,root,root) %{_libdir}/python%{py_ver}/site-packages/_audit.so -%attr(755,root,root) %{_libdir}/python%{py_ver}/site-packages/auparse.so -%{_libdir}/python%{py_ver}/site-packages/audit.py* +%attr(755,root,root) %{python2_sitearch}/_audit.so +%attr(755,root,root) %{python2_sitearch}/auparse.so +%{python2_sitearch}/audit.py* +%endif +%if %{with python3} %files -n python3-audit -%attr(755,root,root) %{_libdir}/python%{py3_ver}/site-packages/_audit.so -%attr(755,root,root) %{_libdir}/python%{py3_ver}/site-packages/auparse.so -%{_libdir}/python%{py3_ver}/site-packages/audit.py* +%attr(755,root,root) %{python3_sitearch}/_audit.so +%attr(755,root,root) %{python3_sitearch}/auparse.so +%{python3_sitearch}/audit.py* +%endif %files -n audit-audispd-plugins %attr(644,root,root) %{_mandir}/man8/audispd-zos-remote.8.gz ++++++ audit.spec ++++++ --- /var/tmp/diff_new_pack.ArBlNv/_old 2018-01-26 13:33:26.306280393 +0100 +++ /var/tmp/diff_new_pack.ArBlNv/_new 2018-01-26 13:33:26.310280206 +0100 @@ -1,7 +1,7 @@ # # spec file for package audit # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed
