- Switch to C Based applet

- Use dbus for messaging. Only run setroubleshoot when

.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

setroubleshoot.spec

@@ -1,15 +1,13 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.0.12
+Version: 2.1.1
-Release: 2%{?dist}
+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
@@ -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}
@@ -111,13 +110,12 @@ Requires: pygobject2
 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 auditd reload >/dev/null 2>&1 || :
-/sbin/service %{name} condrestart >/dev/null 2>&1 || :
 
-%preun server
+%postun server
 if [ $1 = 0 ]; then
-    /sbin/service %{name} stop >/dev/null 2>&1
+   /sbin/service auditd reload >/dev/null 2>&1 || :
-    /sbin/chkconfig --del %{name} || :
 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}/*
+%{_bindir}/sealert
-%{_sbindir}/*
+%{_sbindir}/sedispatch
+%{_sbindir}/setroubleshootd
 %dir %attr(0755,root,root) %{pkgconfigdir}
 %dir %attr(0755,root,root) %{pkgpythondir}
 %{pkgpythondir}/Plugin.py*
@@ -173,15 +174,19 @@ 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 <dwalsh@redhat.com> - 2.1.1-1
+- Switch to C Based applet
+- Use dbus for messaging.  Only run setroubleshoot when 
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 2.0.12-2
 - Rebuild for Python 2.6
 

sources

@@ -1 +1 @@
-ac759999f07a51a29746503854890195  setroubleshoot-2.0.12.tar.gz
+f98fc013d1d371bbf043f9ba832b97f6  setroubleshoot-2.1.1.tar.gz