Author: cactus Date: Sun Dec 4 01:55:34 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 3; mv to new rpm macros, add post,preun,postun actions
---- Files affected: packages/audit: audit.spec (1.83 -> 1.84) ---- Diffs: ================================================================ Index: packages/audit/audit.spec diff -u packages/audit/audit.spec:1.83 packages/audit/audit.spec:1.84 --- packages/audit/audit.spec:1.83 Fri Dec 2 16:48:06 2011 +++ packages/audit/audit.spec Sun Dec 4 02:55:29 2011 @@ -9,7 +9,7 @@ Summary(pl.UTF-8): Narzędzia przestrzeni użytkownika do audytu jąder 2.6 Name: audit Version: 2.1.3 -Release: 2 +Release: 3 License: GPL v2+ Group: Daemons Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz @@ -37,7 +37,7 @@ BuildRequires: rpm-pythonprov BuildRequires: swig-python %endif -BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: rpmbuild(macros) >= 1.623 BuildRequires: sed >= 4.0 Requires(post,preun): /sbin/chkconfig Requires: %{name}-libs = %{version}-%{release} @@ -190,12 +190,12 @@ $RPM_BUILD_ROOT%{_libdir}/libauparse.so # We manually install this since Makefile doesn't -install -d $RPM_BUILD_ROOT{%{_includedir},/lib/systemd/system} +install -d $RPM_BUILD_ROOT{%{_includedir},%{systemdunitdir}} install lib/libaudit.h $RPM_BUILD_ROOT%{_includedir} install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/auditd install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/auditd -install %{SOURCE4} $RPM_BUILD_ROOT/lib/systemd/system +install %{SOURCE4} $RPM_BUILD_ROOT%{systemdunitdir} %if %{with python} %py_comp $RPM_BUILD_ROOT%{py_sitedir} @@ -220,6 +220,16 @@ /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 + %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog README THANKS TODO @@ -297,7 +307,7 @@ %files systemd %defattr(644,root,root,755) -/lib/systemd/system/auditd.service +%{systemdunitdir}/auditd.service %if %{with prelude} %files plugin-prelude @@ -323,6 +333,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.84 2011/12/04 01:55:29 cactus +- rel 3; mv to new rpm macros, add post,preun,postun actions + Revision 1.83 2011/12/02 15:48:06 cactus - rel 2; add systemd service ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/audit/audit.spec?r1=1.83&r2=1.84&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
