rpms/system-config-bind/FC-6 system-config-bind-4.0.2-version-2.patch, NONE, 1.1 system-config-bind.spec, 1.60, 1.61

[fedora-cvs-commits at redhat.com]

Author: stransky

Update of /cvs/dist/rpms/system-config-bind/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv6031

Modified Files:
	system-config-bind.spec 
Added Files:
	system-config-bind-4.0.2-version-2.patch 
Log Message:
added a second patch for issue #216584

system-config-bind-4.0.2-version-2.patch:
 BIND.py |   12 ++++++++++++
 GUI.py  |    8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

--- NEW FILE system-config-bind-4.0.2-version-2.patch ---
--- system-config-bind-4.0.2/BIND.py.old	2006-06-07 20:26:02.000000000 +0200
+++ system-config-bind-4.0.2/BIND.py	2006-11-21 15:59:11.000000000 +0100
@@ -75,6 +75,18 @@
             return
         self.version = r[1]
         debug( 'BIND VERSION:',self.version)
+
+
+        r=commands.getstatusoutput('/bin/rpm -q bind')
+        if (r[0] != 0) or (len(r[1]) <= 0):
+            gui.error(_('Initialization Error'),
+                      _('rpm -q bind:\n')+str(r[0])+' :'+r[1],
+                      True
+                     )
+            return
+	debug( 'BIND PACKAGE:',r[1])
+	self.version_main = string.split(r[1],'-')[1];
+
         self.nmdc = NamedConf()        
         if len(self.nmdc.errors):
             gui.error(_('DNS Configuration File %s Initialisation Error:') % self.nmdc.files[0]['file'] , string.join(self.nmdc.errors,"\n"),True)
--- system-config-bind-4.0.2/GUI.py.old	2006-11-21 12:32:23.000000000 +0100
+++ system-config-bind-4.0.2/GUI.py	2006-11-21 16:00:56.000000000 +0100
@@ -186,13 +186,13 @@
             if(self.arm_pid == 0):
                 try:
                     if os.access('/usr/bin/firefox', os.X_OK):
-                        os.execl('/usr/bin/firefox','', '/usr/share/doc/bind-'+self.bind.version+'/arm/Bv9ARM.html')
+                        os.execl('/usr/bin/firefox','', '/usr/share/doc/bind-'+self.bind.version_main+'/arm/Bv9ARM.html')
                     elif os.access('/usr/bin/mozilla', os.X_OK):
-                        os.execl('/usr/bin/mozilla','', '/usr/share/doc/bind-'+self.bind.version+'/arm/Bv9ARM.html')
+                        os.execl('/usr/bin/mozilla','', '/usr/share/doc/bind-'+self.bind.version_main+'/arm/Bv9ARM.html')
                     elif os.access('/usr/bin/konqueror', os.X_OK):
-                        os.execl('/usr/bin/konqueror','', '/usr/share/doc/bind-'+self.bind.version+'/arm/Bv9ARM.html')
+                        os.execl('/usr/bin/konqueror','', '/usr/share/doc/bind-'+self.bind.version_main+'/arm/Bv9ARM.html')
                     elif os.access('/usr/bin/nautilus', os.X_OK):
-                        os.execl('/usr/bin/nautilus','', '/usr/share/doc/bind-'+self.bind.version+'/arm/Bv9ARM.html')
+                        os.execl('/usr/bin/nautilus','', '/usr/share/doc/bind-'+self.bind.version_main+'/arm/Bv9ARM.html')
                 except:
                     return
     


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/FC-6/system-config-bind.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- system-config-bind.spec	21 Nov 2006 11:42:19 -0000	1.60
+++ system-config-bind.spec	21 Nov 2006 15:17:11 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: 	The Red Hat BIND DNS Configuration Tool.
 Name: 		system-config-bind
 Version: 	4.0.1
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://people.redhat.com/~jvdias/system-config-bind
@@ -9,6 +9,7 @@
 Patch: 		system-config-bind-4.0.1-i18n.patch
 Patch1: 	system-config-bind-4.0.1-i18n-2.patch
 Patch2: 	system-config-bind-4.0.1-version.patch
+Patch3: 	system-config-bind-4.0.2-version-2.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: 	noarch
 BuildRequires:  python, gettext, make, intltool
@@ -33,6 +34,7 @@
 %patch  -p1 -b .i18n
 %patch1 -p1 -b .i18n
 %patch2 -p1
+%patch3 -p1
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -97,6 +99,9 @@
 fi
 
 %changelog
+* Tue Nov 21 2006 Martin Stransky <stransky at redhat.com> - 4.0.1-5
+- added a second patch for issue #216584
+
 * Tue Nov 21 2006 Martin Stransky <stransky at redhat.com> - 4.0.1-4
 - added version patch (for #216584)