rpms/system-config-language/F-13 scl-1.3.4-devel.patch, NONE, 1.1 system-config-language.spec, 1.61, 1.62

[Naveen Kumar]

Author: nkumar

Update of /cvs/pkgs/rpms/system-config-language/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32225

Modified Files:
	system-config-language.spec 
Added Files:
	scl-1.3.4-devel.patch 
Log Message:
* Tue Jun 15 2010 Naveen Kumar <nkumar at redhat.com>- 1.3.4-2
- apply patch scl-1.3.4-devel.patch
- contains some enhanc. reg. force. change of lang. when dep. are not installed
- resolves Bug #568688



scl-1.3.4-devel.patch:
 gui_install.py |   42 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 5 deletions(-)

--- NEW FILE scl-1.3.4-devel.patch ---
--- system-config-language-1.3.4/src/gui_install.py	2010-03-09 17:03:43.000000000 +0530
+++ system-config-language-1 (copy).3.4/src/gui_install.py	2010-04-13 16:50:52.823352853 +0530
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+import language_backend
+import lang_dict
 import string
 import os, sys
 import gtk
@@ -28,7 +30,7 @@
 from yum.constants import *
 
 import gui_progress    
-from gui_errors import *    
+from gui_errors import *
 import gui_detailsDialog
 
 import gettext
@@ -200,7 +202,6 @@
             d.destroy()
             if rc != gtk.RESPONSE_OK:
                 self._undoDepInstalls()
-                raise PirutError
 
     def downloadPackages(self, mainwin):
         class dlcb(urlgrabber.progress.BaseMeter):
@@ -271,10 +272,12 @@
                 for error in errors:
                     errstr.append("%s: %s" %(key, error))
 
-            downloadErrorDialog(mainwin, _("Errors were encountered while "
+            try:
+                downloadErrorDialog(mainwin, _("Errors were encountered while "
                                            "downloading packages."),
                                 details = string.join(errstr, "\n"))
-            
+            except GuiDownloadError:
+                pass
         return dlpkgs
 
     def checkSignatures(self, pkgs, mainwin):
@@ -392,7 +395,36 @@
 
         # download and verify packages
         dlpkgs = self.downloadPackages(mainWindow)
-        self.checkSignatures(dlpkgs, mainWindow)
+        try:
+            self.checkSignatures(dlpkgs, mainWindow)
+        except GuiVerifyError:
+            str = _(" Error installing Selected Language packages: Do you still want to install language without proper support?")
+            d= gtk.MessageDialog(mainWindow, gtk.DIALOG_MODAL,
+                                      gtk.MESSAGE_QUESTION,
+                                      message_format = str)              
+            b = d.add_button(_("No"), gtk.RESPONSE_CANCEL)
+            b = d.add_button(_("Yes"), gtk.RESPONSE_OK)    
+            d.set_default_response(gtk.RESPONSE_OK)
+            rc = d.run()
+            d.destroy() 
+            if rc != gtk.RESPONSE_OK:
+                gtk.main_quit()
+            else:
+                lb=language_backend.LanguageBackend()
+                ld=lang_dict.languages_Dict
+                for (key, val) in ld.iteritems():
+                    if ld[key]==grpid:
+                        lb.originalFile=None
+                        lb.writeI18N(key, "", "latarcyrheb-sun16", "utf8")
+                        # send message to login manager to re-read config / pick up lang change
+                        if os.access("/var/gdm/.gdmfifo", os.F_OK):
+                            try:
+                                fd = os.open("/tmp/.gdm_socket", os.O_WRONLY | os.O_APPEND | os.O_NONBLOCK)
+                                if fd >= 0:
+                                    os.write(fd, "\nUPDATE_CONFIG\n")
+                                    os.close(fd)
+                            except:
+                                pass
 
         # run transaction
         self.runTransaction(mainWindow)      


Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/F-13/system-config-language.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- system-config-language.spec	10 Mar 2010 04:18:07 -0000	1.61
+++ system-config-language.spec	15 Jun 2010 08:37:18 -0000	1.62
@@ -1,9 +1,10 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
 Version: 1.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: https://fedorahosted.org/system-config-language/
 Source0: https://fedorahosted.org/releases/s/y/system-config-language/%{name}-%{version}.tar.bz2
+Patch0: scl-1.3.4-devel.patch
 License: GPLv2
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,6 +26,7 @@ allows the user to change the default la
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make %{?_smp_mflags}
@@ -86,6 +88,11 @@ fi
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
 
 %changelog
+* Tue Jun 15 2010 Naveen Kumar <nkumar at redhat.com>- 1.3.4-2
+- apply patch scl-1.3.4-devel.patch
+- contains some enhanc. reg. force. change of lang. when dep. are not installed 
+- resolves Bug #568688
+
 * Wed Mar 10 2010 Pravin Satpute <psatpute at redhat.com>- 1.3.4-1
 - upstrem new release with updated translations 
 - committed patches to upstream