diff --git a/.cvsignore b/.cvsignore index a2af110..57f6ad1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -setroubleshoot-0.21.tar.gz +setroubleshoot-0.23.tar.gz diff --git a/setroubleshoot.logrotate b/setroubleshoot.logrotate index 2dfc361..5650c84 100644 --- a/setroubleshoot.logrotate +++ b/setroubleshoot.logrotate @@ -1,4 +1,4 @@ -/var/log/setroubleshoot/setroubleshoot.log { +/var/log/setroubleshoot/*.log { weekly rotate 2 missingok diff --git a/setroubleshoot.spec b/setroubleshoot.spec index 3b56ea5..83bea5f 100644 --- a/setroubleshoot.spec +++ b/setroubleshoot.spec @@ -1,7 +1,7 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot -Version: 0.21 -Release: 2 +Version: 0.23 +Release: 1 License: GPL Group: Applications/System URL: http://www.redhat.com/ @@ -24,17 +24,22 @@ Requires: gnome-python2-gtkhtml2 %define pkgconfigdir %{_sysconfdir}/%{name} %define pkglogdir %{_localstatedir}/log/%{name} +Requires: audit >= audit-1.2.5-7 Requires: libselinux >= 1.30.15-1 Requires: pygtk2 >= 2.9.2 Requires: notify-python BuildRequires: intltool gettext python -Requires(post): /sbin/chkconfig, /usr/bin/update-desktop-database -Requires(postun): /usr/bin/update-desktop-database +Requires(post): /sbin/chkconfig +Requires(post): /sbin/service +Requires(post): /usr/bin/update-desktop-database + Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service +Requires(postun): /usr/bin/update-desktop-database + %description Provides tools to help diagnose SELinux problems. When AVC messages are generated an alert can be generated that will give information @@ -57,8 +62,7 @@ make DESTDIR=%{buildroot} install %post /usr/bin/update-desktop-database %{_datadir}/applications /sbin/chkconfig --add %{name} -[ -x /sbin/service ] && /sbin/service %{name} condrestart -exit 0 +/sbin/service %{name} condrestart >/dev/null 2>&1 %preun if [ $1 = 0 ]; then @@ -72,7 +76,6 @@ fi %postun /usr/bin/update-desktop-database %{_datadir}/applications -exit 0 %clean rm -rf %{buildroot} @@ -85,7 +88,7 @@ rm -rf %{buildroot} %{pkgpythondir} %{pkgdatadir} %config(noreplace) %{pkgconfigdir}/%{name}.cfg -%dir %{pkglogdir} +%dir %attr(0777,root,root) %{pkglogdir} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %dir %{pkgrundir} %dir %{pkgvardatadir} @@ -95,8 +98,10 @@ rm -rf %{buildroot} %{_datadir}/pixmaps/*png %changelog -* Sat Aug 12 2006 Florian La Roche - 0.20-2 - * add more deps for post/postun scripts +* Thu Aug 17 2006 John Dennis - 0.23-1 + + * fix for bug #202206, require correct version of audit, + fixes for audit connection. * Thu Aug 10 2006 Dan Walsh - 0.20-1 * add html support diff --git a/sources b/sources index f260a4b..258e9b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3373dbc83f2fc46d78a5777ae672ace setroubleshoot-0.21.tar.gz +540558c05691d20bb47a0eebc5b0be66 setroubleshoot-0.23.tar.gz