[setroubleshoot/f14/master] - Fix Details Button - Fix table display - Handle situations when you have no spath and tpath

Daniel J Walsh dwalsh at fedoraproject.org
Mon Dec 13 19:17:33 UTC 2010 

commit 9d36ddaaccddfd1e9de14ce89f7f4b491bfd9304
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Mon Dec 13 14:17:24 2010 -0500

    - Fix Details Button
    - Fix table display
    - Handle situations when you have no spath and tpath

 .gitignore          |   16 ++++
 setroubleshoot.spec |  191 ++++++++++++++-------------------------------------
 sources             |    2 +-
 3 files changed, 68 insertions(+), 141 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2cceba3..ceba929 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,3 +105,19 @@ setroubleshoot-2.2.93.tar.gz
 /setroubleshoot-2.2.100.tar.gz
 /setroubleshoot-2.2.101.tar.gz
 /setroubleshoot-2.2.102.tar.gz
+/setroubleshoot-3.0.0.tar.gz
+/setroubleshoot-3.0.1.tar.gz
+/setroubleshoot-3.0.2.tar.gz
+/setroubleshoot-3.0.3.tar.gz
+/setroubleshoot-3.0.4.tar.gz
+/setroubleshoot-3.0.5.tar.gz
+/setroubleshoot-3.0.6.tar.gz
+/setroubleshoot-3.0.7.tar.gz
+/setroubleshoot-3.0.8.tar.gz
+/setroubleshoot-3.0.9.tar.gz
+/setroubleshoot-3.0.10.tar.gz
+/setroubleshoot-3.0.11.tar.gz
+/setroubleshoot-3.0.12.tar.gz
+/setroubleshoot-3.0.13.tar.gz
+/setroubleshoot-3.0.14.tar.gz
+/setroubleshoot-3.0.15.tar.gz
diff --git a/setroubleshoot.spec b/setroubleshoot.spec
index ced1afc..712208d 100644
--- a/setroubleshoot.spec
+++ b/setroubleshoot.spec
@@ -1,38 +1,37 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.102
+Version: 3.0.15
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
+# git clone git://git.fedorahosted.org/git/setroubleshoot.git; cd setroubleshoot
+# git archive --prefix setroubleshoot-3.0.10/426cf8ea7a38e8c5179981219d831368161b65f2 > setroubleshoot-3.0.10.tar.gz
 Source0: %{name}-%{version}.tar.gz
 Source2: setroubleshoot.logrotate
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl-XML-Parser
 BuildRequires: libcap-ng-devel
 BuildRequires: intltool gettext python
-BuildRequires: desktop-file-utils dbus-devel gtk2-devel libnotify-devel audit-libs-devel libselinux-devel polkit-devel
+BuildRequires: desktop-file-utils dbus-glib-devel gtk2-devel libnotify-devel audit-libs-devel libselinux-devel polkit-devel
 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-gtkhtml2
-Requires: gtk2 libnotify
-Requires: dbus libnotify
+Requires: gtk2
+Requires: dbus
 Requires: dbus-python
 Requires: pygobject2
 Requires: report-gtk
 Requires: polkit
 Requires: yum
 Requires: gnome-python2-gnomekeyring
-Requires(post): /usr/bin/update-desktop-database
+Requires(post): desktop-file-utils
 Requires(post): dbus
-Requires(postun): /usr/bin/update-desktop-database
+Requires(postun): desktop-file-utils
 Requires(postun): dbus
 Requires: notify-python
-%{?fc7:Requires: selinux-policy-base >= 2.6.4-45}
-%{?fc8:Requires: selinux-policy-base >= 3.0.7-10}
-%{?fc11:Requires: selinux-policy-base >= 3.6.12-48}
 
 BuildRequires: xdg-utils
 Requires: xdg-utils
@@ -51,7 +50,7 @@ Requires: xdg-utils
 %global pkgdatabase   %{pkgvardatadir}/audit_listener_database.xml
 
 %description
-setroubleshoot gui. Application that allows you to view setroubleshoot-server 
+setroubleshoot GUI. Application that allows you to view setroubleshoot-server 
 messages.
 Provides tools to help diagnose SELinux problems. When AVC messages
 are generated an alert can be generated that will give information
@@ -61,22 +60,22 @@ to user preference. The same tools can be run on existing log files.
 %files
 %defattr(-,root,root,-)
 %{pkgguidir}
-%{_sysconfdir}/xdg/autostart/*
-%{_datadir}/applications/*.desktop
+%config(noreplace) %{_sysconfdir}/xdg/autostart/*
+%config %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/sealert.service
 %{_datadir}/icons/hicolor
 %dir %attr(0755,root,root) %{pkgpythondir}
+%{pkgpythondir}/serverconnection.py*
 %{pkgpythondir}/browser.py*
-%{pkgpythondir}/email_dialog.py*
 %{pkgpythondir}/gui_utils.py*
 %{pkgpythondir}/run_cmd.py*
 %{_bindir}/seapplet
-%config %{_datadir}/polkit-1/actions/org.fedoraproject.setroubleshootfixit.policy
-%config %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.SetroubleshootFixit.conf
+%{_datadir}/polkit-1/actions/org.fedoraproject.setroubleshootfixit.policy
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.SetroubleshootFixit.conf
 %{_datadir}/dbus-1/system-services/org.fedoraproject.SetroubleshootFixit.service
 
 %post
-/usr/bin/update-desktop-database %{_datadir}/applications 2> /dev/null
+/usr/bin/desktop-file-install %{_datadir}/applications 2> /dev/null
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 dbus-send --system /com/redhat/setroubleshootd com.redhat.SEtroubleshootdIface.restart string:'rpm install' >/dev/null 2>&1 || :
@@ -131,10 +130,6 @@ 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.
 
 %post server
-if [ -f %{pkgdatabase} ]; then
-    chown root:root %{pkgdatabase} >/dev/null 2>&1
-    chmod 600 %{pkgdatabase} >/dev/null 2>&1
-fi
 /sbin/service auditd reload >/dev/null 2>&1 || :
 
 %postun server
@@ -151,6 +146,7 @@ rm -rf %{buildroot}
 
 %files server -f %{name}.lang 
 %defattr(-,root,root,-)
+%doc %{pkgdocdir}
 %{_bindir}/sealert
 %{_sbindir}/sedispatch
 %{_sbindir}/setroubleshootd
@@ -178,15 +174,15 @@ rm -rf %{buildroot}
 %{pkgpythondir}/uuid.py*
 %{pkgpythondir}/xml_serialize.py*
 %{pkgpythondir}/sesearch/__init__.py*
-%{pkgpythondir}/sesearch/_sesearch.so
-%{pkgpythondir}/default_encoding_utf8.so
+%attr(0755,root,root) %{pkgpythondir}/sesearch/_sesearch.so
+%attr(0755,root,root) %{pkgpythondir}/default_encoding_utf8.so
 %dir %{pkgdatadir}
 %{pkgdatadir}/SetroubleshootFixit.py*
 %{pkgdatadir}/updater.py*
-%config %{pkgconfigdir}/%{name}.cfg
+%config(noreplace) %{pkgconfigdir}/%{name}.conf
 %dir %{pkglogdir}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%config %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.Setroubleshootd.conf
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.Setroubleshootd.conf
 %dir %{pkgrundir}
 %dir %{pkgvardatadir}
 %ghost %attr(0600,root,root) %{pkgdatabase}
@@ -194,144 +190,59 @@ rm -rf %{buildroot}
 %{_mandir}/man8/sealert.8.gz
 %{_mandir}/man8/sedispatch.8.gz
 %{_mandir}/man8/setroubleshootd.8.gz
-/etc/audisp/plugins.d/sedispatch.conf
+%config /etc/audisp/plugins.d/sedispatch.conf
 %{_datadir}/dbus-1/system-services/org.fedoraproject.Setroubleshootd.service
 
 %package doc
 Summary: Setroubleshoot documentation
 Group: System Environment/Base
-Requires(pre): setroubleshoot = %{version}-%{release}
+Requires(pre): setroubleshoot-server = %{version}-%{release}
 
 %description doc
 Setroubleshoot documentation package
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{pkgdocdir}
+%{pkgdocdir}/setroubleshoot*
 
 %changelog
-* Mon Oct 4 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.102-1
-- Remove default width request so that the app can expand with different langs.
-
-* Mon Oct 4 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.101-1
-- Fix date presentation for 24 hour clock to display correctly in sv_SE locale.
-- Add translations for seapplet patch from  Ville-Pekka Vainio
+* Thu Dec 2 2010  <dwalsh at redhat.com> - 3.0.15-1
+- Fix Details Button
+- Fix table display
+- Handle situations when you have no spath and tpath
 
-* Wed Sep 29 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.100-1
-- Stop crash on checking open_with_write
+* Mon Nov 29 2010  <dwalsh at redhat.com> - 3.0.14-1
+- Fix dbus config file to allow console to use sealert
 
-* Wed Sep 22 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.99-1
-- Fix plugin.py error
+* Mon Nov 29 2010  <dwalsh at redhat.com> - 3.0.13-1
+- setroubleshoot will create /var/run/setroubleshoot if it does not exist
 
-* Tue Sep 14 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.98-1
-- Do not blow up on bad /etc/sysconfig/i18n
+* Wed Nov 24 2010  <dwalsh at redhat.com> - 3.0.12-2
+- Ghost /var/run/setroubleshoot
 
-* Thu Aug 26 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.97-1
-- Make sure all python scripts have #! /usr/bin/python -Es
-
-* Thu Aug 26 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.96-1
-- Check in sealert if selinux is disabled and display message box informing user
-
-* Thu Aug 26 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.95-1
-- Check in seapplet if selinux is disabled and exit cleanly
-
-* Mon Aug 23 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.94-1
-- Update po
-- Fix handling of translations
-Resolves: #552922
-
-* Thu Aug 15 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.93-1
-- Fix check on policyupdate
+* Tue Nov 23 2010  <dwalsh at redhat.com> - 3.0.12-1
 - Update translations
+- Allow seapplet to check for updates
 
-* Fri Jul 30 2010 David Malcolm <dmalcolm at redhat.com> - 2.2.91-2
-- rebuild again for python 2.7
-
-* Thu Jul 22 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.91-1
-- Fix os.exists call in setroubleshoot
-- Update po
-- Use -s flag in python to prevent using user site directory
-
-* Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 2.2.89-2
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
-
-* Tue Jun 22 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.89-1
-- Fix rpm version of policy
-
-* Tue Jun 16 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.88-1
-- Checking for policy version was going into infinite loop
-
-* Tue Jun 8 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.87-1
-- Update po
-- Add Thomas Liu patch with lots of fixes.
-- Make startup faster
-
-* Tue May 18 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.86-1
-- Fix permission on icons
-- Add man pages for setroubleshoot and sedispatch
-- Fix desktop file
-Resolves: #594352
-
-* Tue May 18 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.85-2
-- Remove build requires for htmlview
-Resolves: #593313
-
-* Fri May 14 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.85-1
-- Fix browser crash on bad current alert
-
-* Wed May 12 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.84-1
-- Remove Fedora Icon from bug reporting dialog
-
-* Tue May 11 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.83-1
-- Fixed crash on newer policy
-- Update po
-Resolves: #575686
-
-* Mon May 10 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.82-1
-- Redirect update-desktop-database to /dev/null
-- Fix icon listing in desktop file
-- Update po
-
-* Thu May 6 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.81-1
-- Fix icons
-- Update po
-
-* Wed May 5 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.79-1
-- Change icons
-
-* Wed Apr 28 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.78-1
-- Fix man page to document sealert -f
-- Update po
-Resolves: #586699
-
-* Mon Apr 26 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.77-2
-- Remove /usr/share/setroubleshoot from -server package
-Resolves: #552922
-	  
-* Mon Apr 26 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.77-1
-- Fix report_button handling
-- Update po
-
-* Wed Apr 21 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.76-1
-- Fix handling of exceptions
-
-* Tue Apr 20 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.75-1
-- Fix translations in glade
+* Mon Nov 22 2010  <dwalsh at redhat.com> - 3.0.11-1
+- Better handling of tracebacks in terminal mode
+- Fix up messages on process and capability avc messages
+- Update translations
 
-* Mon Apr 19 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.74-1
-- Fix error handling in audit_data
+* Fri Nov 19 2010  <dwalsh at redhat.com> - 3.0.9-1
+- Fix config name
 
-* Fri Apr 16 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.73-1
-- Handle strings containing NULL, abstract sockets
+* Wed Nov 17 2010  <dwalsh at redhat.com> - 3.0.8-1
+- Fix crash in sealert with missing log_*
+- Report bugzillas in english
 
-* Fri Mar 26 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.72-1
-- Change setroubleshoot translations in the system default language
-- Fix handling of current_alert list
-- Fix handling of "/" devices
+* Fri Nov 12 2010  <dwalsh at redhat.com> - 3.0.7-1
+- Apply patch from Yuri Chornoivan to fix spelling mistakes
+- Remove py files that are no longer used
+- Add details button
 
-* Fri Mar 26 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.69-2
-- Remove requires bugzilla, since report will do the right thing
-Resolves: #576927
+* Wed Nov 10 2010  <dwalsh at redhat.com> - 3.0.6-1
+- Fix handling of report_count and ignore button
 
 * Mon Mar 15 2010  Dan Walsh <dwalsh at redhat.com> - 2.2.69-1
 - Add white level, so plugins can tell setroubleshoot to ignore avc
@@ -364,7 +275,7 @@ Resolves: #576927
 * Tue Jan 26 2010 Dan Walsh <dwalsh at redhat.com> - 2.2.61-1
 - Add Gavin Romig-Koch report patch
 - Cleanup Browser window
-- Remove avc messages that are allowed or dontaudited in current policy
+- Remove avc messages that are allowed or dontaudited in current poilcy
 
 * Fri Jan 22 2010 Dan Walsh <dwalsh at redhat.com> - 2.2.60-1
 - Remove untest attachfile code
diff --git a/sources b/sources
index ec19236..f102eea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91950b04d8330132b3c205e659e14bd2  setroubleshoot-2.2.102.tar.gz
+a4ae3d2e71f9332f534d80a0a9a0d380  setroubleshoot-3.0.15.tar.gz

More information about the scm-commits mailing list