diff --git a/.cvsignore b/.cvsignore index 6aa5dc6..9780df5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -4,3 +4,4 @@ setroubleshoot-2.0.9.tar.gz setroubleshoot-2.0.10.tar.gz setroubleshoot-2.0.11.tar.gz setroubleshoot-2.0.12.tar.gz +setroubleshoot-2.1.1.tar.gz diff --git a/setroubleshoot.spec b/setroubleshoot.spec index 4cf0241..0b14b9f 100644 --- a/setroubleshoot.spec +++ b/setroubleshoot.spec @@ -1,27 +1,25 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot -Version: 2.0.12 -Release: 2%{?dist} +Version: 2.1.1 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/setroubleshoot Source0: %{name}-%{version}.tar.gz -Source1: setroubleshoot.init Source2: setroubleshoot.logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch BuildRequires: perl-XML-Parser Requires: %{name}-server = %{version}-%{release} Requires: %{name}-plugins >= 2.0.4 Requires: pygtk2 >= 2.9.2 -Requires: gnome-python2-gnome, gnome-python2-canvas +Requires: gnome-python2-gnome, gnome-python2-canvas BuildRequires: desktop-file-utils Requires: gnome-python2-gtkhtml2 Requires: dbus Requires: dbus-python Requires: libxml2-python -Requires(post): /usr/bin/update-desktop-database -Requires(post): dbus +Requires(post): /usr/bin/update-desktop-database +Requires(post): dbus Requires(postun): /usr/bin/update-desktop-database Requires(postun): dbus Requires: notify-python @@ -60,6 +58,7 @@ about the problem and help track its resolution. Alerts can be configured to user preference. The same tools can be run on existing log files. %files +%defattr(-,root,root,-) %{pkgguidir} %{_sysconfdir}/xdg/autostart/* %{_datadir}/applications/*.desktop @@ -70,6 +69,7 @@ to user preference. The same tools can be run on existing log files. %{pkgpythondir}/email_dialog.py* %{pkgpythondir}/gui_utils.py* %{pkgpythondir}/run_cmd.py* +%{_bindir}/seapplet %post /usr/bin/update-desktop-database %{_datadir}/applications @@ -92,7 +92,6 @@ make %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install -%{__install} -D -m755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/%{name} %{__install} -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{buildroot}/%{_datadir}/applications/%{name}.desktop touch %{buildroot}%{pkgdatabase} @@ -108,16 +107,15 @@ Requires: audit >= 1.2.6-3 Requires: audit-libs-python >= 1.2.6-3 Requires: libselinux >= 1.30.15-1 Requires: pygobject2 -Requires: dbus-python +Requires: dbus-python Requires: libxml2-python Requires: libselinux-python -Requires: audit-libs-python +Requires: rpm-python BuildRequires: intltool gettext python Requires(post): /sbin/chkconfig Requires(post): /sbin/service - Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service @@ -132,23 +130,26 @@ if [ -f %{pkgdatabase} ]; then chown root:root %{pkgdatabase} >/dev/null 2>&1 chmod 600 %{pkgdatabase} >/dev/null 2>&1 fi -/sbin/chkconfig --add %{name} -/sbin/service %{name} condrestart >/dev/null 2>&1 || : +/sbin/service auditd reload >/dev/null 2>&1 || : -%preun server +%postun server if [ $1 = 0 ]; then - /sbin/service %{name} stop >/dev/null 2>&1 - /sbin/chkconfig --del %{name} || : + /sbin/service auditd reload >/dev/null 2>&1 || : fi +%triggerun server -- %{name}-server < 2.1.1 +/sbin/service %{name} stop >/dev/null 2>&1 || : +chkconfig --del %{name} || : + %clean rm -rf %{buildroot} %files server -f %{name}.lang %defattr(-,root,root,-) %doc %{pkgdocdir} -%{_bindir}/* -%{_sbindir}/* +%{_bindir}/sealert +%{_sbindir}/sedispatch +%{_sbindir}/setroubleshootd %dir %attr(0755,root,root) %{pkgconfigdir} %dir %attr(0755,root,root) %{pkgpythondir} %{pkgpythondir}/Plugin.py* @@ -173,28 +174,32 @@ rm -rf %{buildroot} %config %{pkgconfigdir}/%{name}.cfg %dir %{pkglogdir} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%config %{_sysconfdir}/dbus-1/system.d/setroubleshootd.conf +%config %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.Setroubleshootd.conf %dir %{pkgrundir} %dir %{pkgvardatadir} %ghost %attr(0600,root,root) %{pkgdatabase} %ghost %attr(0644,root,root) %{pkgvardatadir}/email_alert_recipients %{_mandir}/man8/sealert.8.gz -%attr(0755,root,root) /etc/rc.d/init.d/%{name} +/etc/audisp/plugins.d/sedispatch.conf %changelog +* Fri Jan 16 2009 Dan Walsh - 2.1.1-1 +- Switch to C Based applet +- Use dbus for messaging. Only run setroubleshoot when + * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.0.12-2 - Rebuild for Python 2.6 * Wed Oct 15 2008 Dan Walsh - 2.0.12-1 - Update to upstream - 2008-10-06 Dan Walsh - - remove .png from desktop files + - remove .png from desktop files * Mon Sep 22 2008 Dan Walsh - 2.0.11-1 - Update to upstream - 2008-10-22 - - Fix pruning code - - Fix time stamps + - Fix pruning code + - Fix time stamps * Wed Sep 10 2008 Dan Walsh - 2.0.10-2 - Fix requires line to gnome-python2-gnome @@ -210,14 +215,14 @@ rm -rf %{buildroot} - Update translations * Thu Feb 21 2008 - 2.0.6-1 - - add dialog to run a command in the background, capture it's stdout & stderr - report it's status, kill it, and pass it a pseudo terminal for password prompts - - separate the fix command into it's own section in formatted alerts - - add UI for running the fix command, enable only if there is a single selection - and the selected alert has a fix command - - add a config parameters 'run_fix_cmd_enable' to control if fix commands - can be run, defaults to False - - Resolve bug #431380: prevent notify popups while setroubleshoot is open + - add dialog to run a command in the background, capture it's stdout & stderr + report it's status, kill it, and pass it a pseudo terminal for password prompts + - separate the fix command into it's own section in formatted alerts + - add UI for running the fix command, enable only if there is a single selection + and the selected alert has a fix command + - add a config parameters 'run_fix_cmd_enable' to control if fix commands + can be run, defaults to False + - Resolve bug #431380: prevent notify popups while setroubleshoot is open * Wed Feb 6 2008 John Dennis - 2.0.5-1 - allow sealert -l lookup to accept * wildcard diff --git a/sources b/sources index 7ea8112..e555a61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac759999f07a51a29746503854890195 setroubleshoot-2.0.12.tar.gz +f98fc013d1d371bbf043f9ba832b97f6 setroubleshoot-2.1.1.tar.gz