[system-config-language/f14/master] * Mon Oct 11 2010 Naveen Kumar <nkumar at redhat.com>- 1.3.5-4 - apply patch s-c-l-634556.patch - resol

[Naveen Kumar]

commit 060b498f950458d6c109159b9066220580b6da10
Author: Naveen Kumar <nkumar at redhat.com>
Date:   Mon Oct 11 16:36:30 2010 +0530

    * Mon Oct 11 2010 Naveen Kumar <nkumar at redhat.com>- 1.3.5-4
    - apply patch s-c-l-634556.patch
    - resolves bug #634556
    - modifications in s-c-l to install even conditional & default packages

 s-c-l-634556.patch          |   49 +++++++++++++++++++++++++++++++++++++++++++
 system-config-language.spec |    9 +++++++-
 2 files changed, 57 insertions(+), 1 deletions(-)
---
diff --git a/s-c-l-634556.patch b/s-c-l-634556.patch
new file mode 100644
index 0000000..2ee26ee
--- /dev/null
+++ b/s-c-l-634556.patch
@@ -0,0 +1,49 @@
+Binary files system-config-language-1.3.5/src/gui_detailsDialog.pyc and system-config-language-1.3.5mod/src/gui_detailsDialog.pyc differ
+Binary files system-config-language-1.3.5/src/gui_errors.pyc and system-config-language-1.3.5mod/src/gui_errors.pyc differ
+Binary files system-config-language-1.3.5/src/gui_install.pyc and system-config-language-1.3.5mod/src/gui_install.pyc differ
+Binary files system-config-language-1.3.5/src/gui_progress.pyc and system-config-language-1.3.5mod/src/gui_progress.pyc differ
+Binary files system-config-language-1.3.5/src/lang_dict.pyc and system-config-language-1.3.5mod/src/lang_dict.pyc differ
+Binary files system-config-language-1.3.5/src/language_backend.pyc and system-config-language-1.3.5mod/src/language_backend.pyc differ
+diff -uNr system-config-language-1.3.5/src/language_gui.py system-config-language-1.3.5mod/src/language_gui.py
+--- system-config-language-1.3.5/src/language_gui.py	2010-08-26 15:01:06.000000000 +0530
++++ system-config-language-1.3.5mod/src/language_gui.py	2010-10-11 15:40:47.364842748 +0530
+@@ -264,16 +264,16 @@
+                                        
+             if not is_RepoError:   
+                 if not install.is_group_installed(grpid, self.mainWindow):
+-                    install.selectGroup(grpid)
++                    pass
+                 
+-                    # do depsolve.  determine if we've added anything or not.
+-                    install.checkDeps(self.mainWindow)
+-                    install.depDetails(self.mainWindow)
+-                    
+-                    
+-                    dlpkgs = map(lambda x: x.po, filter(lambda txmbr:txmbr.ts_state in ("i", "u"),install.tsInfo.getMembers()))
+-		    
+-		    if len(dlpkgs)!=0:
++            install.selectGroup(grpid)
++            # do depsolve.  determine if we've added anything or not.
++            install.checkDeps(self.mainWindow)
++            install.depDetails(self.mainWindow)    
++                
++            dlpkgs = map(lambda x: x.po, filter(lambda txmbr:txmbr.ts_state in ("i", "u"),install.tsInfo.getMembers()))
++    
++            if len(dlpkgs)!=0:
+                     	str = _(" language support is not installed, do you want to install it?")                
+                     	str = grpid[:-8] + str
+                     	str = str.capitalize()
+@@ -290,8 +290,8 @@
+             
+                     	if rc == gtk.RESPONSE_OK:                               
+                         	install.install_language (self.mainWindow, grpid)                           
+-		    else:
+-			pass	
++            else:
++			     pass	
+ 
+         if self.installedLangs == None:
+             self.languageBackend.writeI18N(defaultLang, "", sysfont, sysfontacm)
+Binary files system-config-language-1.3.5/src/language_gui.pyc and system-config-language-1.3.5mod/src/language_gui.pyc differ
+Binary files system-config-language-1.3.5/src/language_tui.pyc and system-config-language-1.3.5mod/src/language_tui.pyc differ
+Binary files system-config-language-1.3.5/src/tui_install.pyc and system-config-language-1.3.5mod/src/tui_install.pyc differ
diff --git a/system-config-language.spec b/system-config-language.spec
index 1404629..2516c47 100644
--- a/system-config-language.spec
+++ b/system-config-language.spec
@@ -1,11 +1,12 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
 Version: 1.3.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: https://fedorahosted.org/system-config-language/
 Source0: https://fedorahosted.org/releases/s/y/system-config-language/%{name}-%{version}.tar.bz2
 Patch0: s-c-l-624008.patch
 Patch1: s-c-l-638650.patch
+Patch2: s-c-l-634556.patch
 License: GPLv2
 Group: System Environment/Base
 BuildArch: noarch
@@ -27,6 +28,7 @@ allows the user to change the default language of the system.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 make %{?_smp_mflags}
@@ -80,6 +82,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
 
 %changelog
+* Mon Oct 11 2010 Naveen Kumar <nkumar at redhat.com>- 1.3.5-4
+- apply patch s-c-l-634556.patch
+- resolves bug #634556
+- modifications in s-c-l to install even conditional & default packages
+
 * Thu Oct 7 2010 Naveen Kumar <nkumar at redhat.com>- 1.3.5-3
 - apply patch s-c-l-638650.patch
 - resolves bug #638650