rpms/system-config-language/F-13 s-c-l_598423.patch, NONE, 1.1 system-config-language.spec, 1.62, 1.63
Naveen Kumar
nkumar at fedoraproject.org
Fri Jun 18 06:36:39 UTC 2010
Author: nkumar
Update of /cvs/pkgs/rpms/system-config-language/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28036
Modified Files:
system-config-language.spec
Added Files:
s-c-l_598423.patch
Log Message:
* Fri Jun 18 2010 Naveen Kumar <nkumar at redhat.com>- 1.3.4-3
- apply patch s-c-l_598423.patch
- resolves bug #598423
s-c-l_598423.patch:
gui_install.py | 37 ++++++++++++++++++++++++++++++++++---
lang_dict.py | 1 +
locale-list | 1 +
3 files changed, 36 insertions(+), 3 deletions(-)
--- NEW FILE s-c-l_598423.patch ---
diff -uNr system-config-language-1.3.4/src/gui_install.py system-config-language-1.3.4-598423/src/gui_install.py
--- system-config-language-1.3.4/src/gui_install.py 2010-06-17 19:40:11.034501527 +0530
+++ system-config-language-1.3.4-598423/src/gui_install.py 2010-06-17 19:51:47.504503202 +0530
@@ -76,15 +76,46 @@
while (gtk.events_pending ()):
gtk.main_iteration ();
-
+
+ groupexists = True
if not self.comps.has_group(grpid):
- raise yum.Errors.GroupsError, "No Group named %s exists" % grpid
+ groupexists = False
thisgroup = self.comps.return_group(grpid)
d.destroy()
if not thisgroup:
- raise yum.Errors.GroupsError, "No Group named %s exists" % grpid
+ groupexists = False
+
+ if groupexists == False:
+ str = _("No Group named %s exists: Do you still want to install language without proper support?" %grpid)
+ gd= gtk.MessageDialog(mainwin, gtk.DIALOG_MODAL,
+ gtk.MESSAGE_QUESTION,
+ message_format = str)
+ b = gd.add_button(_("No"), gtk.RESPONSE_CANCEL)
+ b = gd.add_button(_("Yes"), gtk.RESPONSE_OK)
+ d.set_default_response(gtk.RESPONSE_OK)
+ rc = gd.run()
+ gd.destroy()
+ if rc == gtk.RESPONSE_OK:
+ 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
+ return True
+ else:
+ raise yum.Errors.GroupsError, "No Group named %s exists" % grpid
if thisgroup.installed:
return True
diff -uNr system-config-language-1.3.4/src/lang_dict.py system-config-language-1.3.4-598423/src/lang_dict.py
--- system-config-language-1.3.4/src/lang_dict.py 2010-03-09 17:03:43.000000000 +0530
+++ system-config-language-1.3.4-598423/src/lang_dict.py 2010-06-17 19:54:29.025376370 +0530
@@ -36,6 +36,7 @@
"ar_AE.UTF-8":"arabic-support", \
"ar_YE.UTF-8":"arabic-support", \
"as_IN.UTF-8":"assamese-support", \
+ "ast_ES.UTF-8":"asturian-support", \
"eu_ES.UTF-8":"basque-support", \
"be_BY.UTF-8":"belarusian-support", \
"bn_BD.UTF-8":"bengali-support", \
diff -uNr system-config-language-1.3.4/src/locale-list system-config-language-1.3.4-598423/src/locale-list
--- system-config-language-1.3.4/src/locale-list 2010-03-09 17:03:43.000000000 +0530
+++ system-config-language-1.3.4-598423/src/locale-list 2010-06-17 19:56:33.963376789 +0530
@@ -19,6 +19,7 @@
ar_AE.UTF-8 utf8 latarcyrheb-sun16 Arabic (United Arab Emirates)
ar_YE.UTF-8 utf8 latarcyrheb-sun16 Arabic (Yemen)
as_IN.UTF-8 utf8 latarcyrheb-sun16 Assamese (India)
+ast_ES.UTF-8 utf8 latarcyrheb-sun16 Asturian (Spain)
eu_ES.UTF-8 utf8 latarcyrheb-sun16 Basque (Spain)
be_BY.UTF-8 utf8 latarcyrheb-sun16 Belarusian
bn_BD.UTF-8 utf8 latarcyrheb-sun16 Bengali (BD)
Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/F-13/system-config-language.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- system-config-language.spec 15 Jun 2010 08:37:18 -0000 1.62
+++ system-config-language.spec 18 Jun 2010 06:36:38 -0000 1.63
@@ -1,10 +1,11 @@
Summary: A graphical interface for modifying the system language
Name: system-config-language
Version: 1.3.4
-Release: 2%{?dist}
+Release: 3%{?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
+Patch1: s-c-l_598423.patch
License: GPLv2
Group: System Environment/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,6 +28,7 @@ allows the user to change the default la
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
make %{?_smp_mflags}
@@ -88,6 +90,10 @@ fi
%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
%changelog
+* Fri Jun 18 2010 Naveen Kumar <nkumar at redhat.com>- 1.3.4-3
+- apply patch s-c-l_598423.patch
+- resolves bug #598423
+
* 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
More information about the scm-commits
mailing list