!2 audit

Merge pull request !2 from syyhao/init

audit.spec

@@ -3,7 +3,7 @@
 Summary:            User space tools for kernel auditing
 Name:               audit
 Version:            3.0
-Release:            4
+Release:            5
 License:            GPLv2+ and LGPLv2+
 URL:                http://people.redhat.com/sgrubb/audit/
 Source0:            http://people.redhat.com/sgrubb/audit/%{name}-%{version}-alpha5.tar.gz
@@ -28,24 +28,46 @@ BuildRequires:      python2 python-unversioned-command
 %ifarch %{golang_arches}
 BuildRequires:      golang
 %endif
-Requires:           openldap
+Requires:           %{name}-libs = %{version}-%{release}
 Requires(post):     systemd coreutils
 Requires(preun):    systemd
 Requires(postun):   systemd coreutils
 
-Provides:           audit-libs = %{version}-%{release}
-Provides:           audit-libs%{?_isa}  = %{version}-%{release}
-Provides:           audispd-plugins = %{version}-%{release}
-Provides:           audispd-plugins-zos = %{version}-%{release}
-Obsoletes:          audit-libs < %{version}-%{release}
-Obsoletes:          audispd-plugins < %{version}-%{release}
-Obsoletes:          audispd-plugins-zos < %{version}-%{release}
-
 %description
 The audit package contains the user space utilities for storing and searching
 the audit records generated by the audit subsystem in the Linux 2.6 and later
 kernels.
 
+
+%package libs
+Summary: Dynamic library for libaudit
+License: LGPLv2+
+
+%description libs
+The audit-libs package contains the dynamic libraries needed for 
+applications to use the audit framework.
+
+%package -n audispd-plugins
+Summary: Plugins for audit event dispatcher
+License: GPLv2+
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+
+%description -n audispd-plugins
+This package provides plugins for the real-time interface to audispd.
+
+%package -n audispd-plugins-zos
+Summary: z/OS plugin for audit event dispatcher
+License: GPLv2+
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+Requires: openldap
+
+%description -n audispd-plugins-zos
+This package provides a z/OS plugin for audit event dispatcher that
+will forward audit events to a configured z/OS service management facility
+database.
+
 %package devel
 Summary:            Header files for libaudit
 License:            LGPLv2+
@@ -165,7 +187,6 @@ if [ $1 -ge 1 ]; then
    /sbin/service auditd condrestart > /dev/null 2>&1 || :
 fi
 
-
 %files
 %doc README
 %{!?_licensedir:%global license %%doc}
@@ -176,13 +197,10 @@ fi
 %attr(755,root,root) /sbin/aureport
 %attr(750,root,root) /sbin/autrace
 %attr(755,root,root) /sbin/augenrules
-%attr(750,root,root) /sbin/audispd-zos-remote
 %attr(755,root,root) %{_bindir}/aulast
 %attr(755,root,root) %{_bindir}/aulastlog
 %attr(755,root,root) %{_bindir}/ausyscall
 %attr(755,root,root) %{_bindir}/auvirt
-%attr(755,root,root) /%{_lib}/libaudit.so.1*
-%attr(755,root,root) /%{_lib}/libauparse.*
 %attr(644,root,root) %{_unitdir}/auditd.service
 %attr(750,root,root) %dir %{_libexecdir}/initscripts/legacy-actions/auditd
 %attr(750,root,root) %{_libexecdir}/initscripts/legacy-actions/auditd/condrestart
@@ -202,16 +220,25 @@ fi
 %ghost %config(noreplace) %attr(640,root,root) /etc/audit/audit.rules
 %config(noreplace) %attr(640,root,root) /etc/audit/audit-stop.rules
 %config(noreplace) %attr(640,root,root) /etc/audit/plugins.d/af_unix.conf
+
+%files libs
+/%{_lib}/libaudit.so.1*
+/%{_lib}/libauparse.*
+%config(noreplace) %attr(640,root,root) /etc/libaudit.conf
+
+%files -n audispd-plugins
 %config(noreplace) %attr(640,root,root) /etc/audit/audisp-remote.conf
 %config(noreplace) %attr(640,root,root) /etc/audit/plugins.d/au-remote.conf
 %config(noreplace) %attr(640,root,root) /etc/audit/plugins.d/syslog.conf
-%config(noreplace) %attr(640,root,root) /etc/libaudit.conf
-%config(noreplace) %attr(640,root,root) /etc/audit/plugins.d/audispd-zos-remote.conf
-%config(noreplace) %attr(640,root,root) /etc/audit/zos-remote.conf
 %attr(750,root,root) /sbin/audisp-remote
 %attr(750,root,root) /sbin/audisp-syslog
 %attr(700,root,root) %dir %{_var}/spool/audit
 
+%files -n audispd-plugins-zos
+%config(noreplace) %attr(640,root,root) /etc/audit/plugins.d/audispd-zos-remote.conf
+%config(noreplace) %attr(640,root,root) /etc/audit/zos-remote.conf
+%attr(750,root,root) /sbin/audispd-zos-remote
+
 %files devel
 %defattr(-,root,root)
 %doc contrib/plugin
@@ -249,6 +276,9 @@ fi
 %attr(644,root,root) %{_mandir}/man8/*.8.gz
 
 %changelog
+* Wed Jan 22 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.0-5
+- add subpackages
+
 * Tue Jan 14 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.0-4
 - clean code