Author: baggins Date: Sun Mar 4 10:25:16 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 2 - merge systemd into main package (sorry qboosh) - fix systemd scriptlets
---- Files affected: packages/audit: audit.spec (1.85 -> 1.86) ---- Diffs: ================================================================ Index: packages/audit/audit.spec diff -u packages/audit/audit.spec:1.85 packages/audit/audit.spec:1.86 --- packages/audit/audit.spec:1.85 Sun Mar 4 10:51:56 2012 +++ packages/audit/audit.spec Sun Mar 4 11:25:11 2012 @@ -9,7 +9,7 @@ Summary(pl.UTF-8): Narzędzia przestrzeni użytkownika do audytu jąder 2.6 Name: audit Version: 2.2 -Release: 1 +Release: 2 License: GPL v2+ Group: Daemons Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz @@ -42,7 +42,9 @@ Requires(post,preun): /sbin/chkconfig Requires: %{name}-libs = %{version}-%{release} Requires: rc-scripts +Requires: systemd-units Obsoletes: audit-audispd-plugins +Obsoletes: audit-systemd BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sbindir /sbin @@ -133,19 +135,6 @@ %description -n python-audit -l pl.UTF-8 Pythonowy interfejs do biblioteki libaudit. -%package systemd -Summary: systemd units for audit -Summary(pl.UTF-8): Jednostki systemd dla usługi audit -Group: Base -Requires: %{name} = %{version}-%{release} -Requires: systemd-units - -%description systemd -systemd units for audit. - -%description systemd -l pl.UTF-8 -Jednostki systemd dla usługi audit. - %prep %setup -q %patch0 -p1 @@ -218,22 +207,20 @@ %post /sbin/chkconfig --add auditd %service auditd restart "audit daemon" +%systemd_post auditd.service %preun if [ "$1" = "0" ]; then %service auditd stop /sbin/chkconfig --del auditd fi - -%post systemd -%systemd_post -%systemd_enable auditd.service - -%preun systemd %systemd_preun auditd.service -%postun systemd -%systemd_postun auditd.service +%postun +%systemd_reload + +%triggerpostun -- %{name} < 2.2-2 +%systemd_trigger auditd.service %files %defattr(644,root,root,755) @@ -264,6 +251,7 @@ %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/audit/audit.rules %attr(754,root,root) /etc/rc.d/init.d/auditd %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/auditd +%{systemdunitdir}/auditd.service %attr(750,root,root) %dir %{_var}/log/audit %{_mandir}/man5/audispd.conf.5* %{_mandir}/man5/audisp-remote.conf.5* @@ -312,10 +300,6 @@ %{_libdir}/libaudit.a %{_libdir}/libauparse.a -%files systemd -%defattr(644,root,root,755) -%{systemdunitdir}/auditd.service - %if %{with prelude} %files plugin-prelude %defattr(644,root,root,755) @@ -340,6 +324,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.86 2012/03/04 10:25:11 baggins +- rel 2 +- merge systemd into main package (sorry qboosh) +- fix systemd scriptlets + Revision 1.85 2012/03/04 09:51:56 qboosh - updated to 2.2 - pl for -systemd ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/audit/audit.spec?r1=1.85&r2=1.86&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
