Resolves bug# 233760, fix autogen problem resulting in /usr/local prefix

setroubleshoot-autogen.patch

@@ -0,0 +1,90 @@
+diff -r -u setroubleshoot-1.9.4/src/config.py setroubleshoot-1.9.4.good/src/config.py
+--- setroubleshoot-1.9.4/src/config.py	2007-03-19 14:56:59.000000000 -0400
++++ setroubleshoot-1.9.4.good/src/config.py	2007-05-07 14:25:12.438028000 -0400
+@@ -32,7 +32,7 @@
+ 
+ _cfg = None
+ 
+-CFG_FILE = os.path.join('/usr/local/etc/setroubleshoot', "%s.cfg" % 'setroubleshoot')
++CFG_FILE = os.path.join('/etc/setroubleshoot', "%s.cfg" % 'setroubleshoot')
+ 
+ LOG_CATEGORIES = ['rpc','xml','cfg','alert','sig','plugin','avc',
+ 	          'email','gui', 'gui_data', 'program','database','server','dbus',
+@@ -41,7 +41,7 @@
+ defaults = {
+ 'general' : {
+     'pid_file' : {
+-        'value'       : '/usr/local/var/run/setroubleshootd.pid',
++        'value'       : '/var/run/setroubleshootd.pid',
+         'description' : '',
+         'readOnly'    : False,
+     },
+@@ -65,12 +65,12 @@
+         'readOnly'    : True,
+     },
+     'data_dir' : {
+-        'value'       : '/usr/local/share/setroubleshoot',
++        'value'       : '/usr/share/setroubleshoot',
+         'description' : '',
+         'readOnly'    : True,
+     },
+     'config_dir' : {
+-        'value'       : '/usr/local/etc/setroubleshoot',
++        'value'       : '/etc/setroubleshoot',
+         'description' : '',
+         'readOnly'    : True,
+     },
+@@ -93,7 +93,7 @@
+ },
+ 'alert' : {
+     'status_icon' : {
+-        'value'       : os.path.join('/usr/local/share/setroubleshoot/gui','setroubleshoot_icon.png'),
++        'value'       : os.path.join('/usr/share/setroubleshoot/gui','setroubleshoot_icon.png'),
+         'description' : '',
+         'readOnly'    : True,
+     },
+@@ -104,7 +104,7 @@
+ },
+ 'plugins' : {
+     'plugin_dir' : {
+-        'value'       : '/usr/local/share/setroubleshoot/plugins',
++        'value'       : '/usr/share/setroubleshoot/plugins',
+         'description' : '',
+     },
+ },
+@@ -127,7 +127,7 @@
+ },
+ 'database' : {
+     'database_dir' : {
+-        'value'       : '/usr/local/var/lib/setroubleshoot',
++        'value'       : '/var/lib/setroubleshoot',
+         'description' : '',
+     },
+     'filename' : {
+@@ -141,7 +141,7 @@
+         'description' : '',
+     },
+     'path' : {
+-        'value'       : os.path.join('/usr/local/var/run/setroubleshoot','setroubleshoot_server'),
++        'value'       : os.path.join('/var/run/setroubleshoot','setroubleshoot_server'),
+         'description' : '',
+         'readOnly'    : False,
+     },
+@@ -203,7 +203,7 @@
+ The list of available categories is: [%s]''' % ', '.join(LOG_CATEGORIES),
+     },
+     'filename' : {
+-        'value'       : '/usr/local/var/log/setroubleshoot/setroubleshootd.log',
++        'value'       : '/var/log/setroubleshoot/setroubleshootd.log',
+         'description' : '',
+     },
+     'filemode' : {
+@@ -301,7 +301,7 @@
+         'description' : 'The Subject: email header',
+     },
+     'recipients_filepath' : {
+-        'value'       : os.path.join('/usr/local/var/lib/setroubleshoot', 'email_alert_recipients'),
++        'value'       : os.path.join('/var/lib/setroubleshoot', 'email_alert_recipients'),
+         'description' : 'Path name of file with email recipients. One address per line, optionally followed by enable flag. Comment character is #. '
+     },
+ },

setroubleshoot.spec

@@ -1,13 +1,14 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 1.9.5
+Version: 1.9.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 Source1: setroubleshoot.init
 Source2: setroubleshoot.logrotate
+Patch0: setroubleshoot-autogen.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: perl-XML-Parser
@@ -61,6 +62,7 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 %prep
 %setup -q
+%patch0 -p1 -b .autogen
 
 %build
 %configure
@@ -148,9 +150,8 @@ rm -rf %{buildroot}
 /etc/rc.d/init.d/%{name}
 
 %changelog
-* Wed Apr 25 2007 Dan Walsh <dwalsh@redhat.com> - 1.9.5-1
+* Mon May  7 2007 John Dennis <jdennis@redhat.com> - 1.9.4-2
-- Update translations
+	- Resolves bug# 233760, fix autogen problem resulting in /usr/local prefix
-- Fix mislabeled file
 
 * Mon Mar 19 2007 Dan Walsh <dwalsh@redhat.com> - 1.9.4-1
 	- Remove disable_trans boolean