rpms/audit/FC-5 audit.spec, 1.87, 1.88 audit-1.1.3-initscript-disabled.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: sgrubb

Update of /cvs/dist/rpms/audit/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32231

Modified Files:
	audit.spec 
Removed Files:
	audit-1.1.3-initscript-disabled.patch 
Log Message:
* Tue Sep 19 2006 Steve Grubb <sgrubb at redhat.com> 1.2.7-2.fc5
- Remove the audit dispatcher since backport of setroubleshooter is not likely



Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/FC-5/audit.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- audit.spec	18 Sep 2006 23:54:01 -0000	1.87
+++ audit.spec	19 Sep 2006 14:37:43 -0000	1.88
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.2.7
-Release: 1
+Release: 2.fc5
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -90,6 +90,9 @@
 rm -f $RPM_BUILD_ROOT/%{_lib}/libauparse.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/python2.4/site-packages/_audit.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/python2.4/site-packages/_audit.la
+# These are from setroubleshooter which may not be backported
+rm -f $RPM_BUILD_ROOT/sbin/audispd
+rm -f $RPM_BUILD_ROOT/usr/lib/python*/site-packages/AuditMsg.py*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,14 +101,6 @@
 
 %post
 /sbin/chkconfig --add auditd
-if [ -f /etc/auditd.conf ]; then
-   tmp=`mktemp /etc/auditd-post.XXXXXX`
-   if [ -n $tmp ]; then
-      sed 's|#dispatcher|dispatcher|g' /etc/auditd.conf > $tmp && \
-      cat $tmp > /etc/auditd.conf
-      rm -f $tmp
-   fi
-fi
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -138,10 +133,8 @@
 
 %files libs-python
 %defattr(-,root,root)
-%attr(750,root,root) /sbin/audispd
 %{_libdir}/python*/site-packages/_audit.so
 /usr/lib/python*/site-packages/audit.py*
-/usr/lib/python*/site-packages/AuditMsg.py*
 
 %files
 %defattr(-,root,root,-)
@@ -160,6 +153,9 @@
 
 
 %changelog
+* Tue Sep 19 2006 Steve Grubb <sgrubb at redhat.com> 1.2.7-2.fc5
+- Remove the audit dispatcher since backport of setroubleshooter is not likely
+
 * Mon Sep 18 2006 Steve Grubb <sgrubb at redhat.com> 1.2.7-1
 - Update to new version that is designed for 2.6.18 kernel
 


--- audit-1.1.3-initscript-disabled.patch DELETED ---