[system-config-language] * Mon Aug 9 2010 Naveen Kumar <nkumar at redhat.com>- 1.3.4-6 - apply patch s-c-l_445796_545499.patch -
Naveen Kumar
nkumar at fedoraproject.org
Mon Aug 9 10:42:39 UTC 2010
commit 1dfc6f0cd09978979aa58d7a05cb8632e9ddac1f
Author: Naveen Kumar <nkumar at localhost.localdomain>
Date: Mon Aug 9 16:10:29 2010 +0530
* Mon Aug 9 2010 Naveen Kumar <nkumar at redhat.com>- 1.3.4-6
- apply patch s-c-l_445796_545499.patch
- resolves bug #445796
- resolves bug #545499
s-c-l_445796_545499.patch | 97 +++++++++++++++++++++++++++++++++++++++++++
system-config-language.spec | 9 ++++-
2 files changed, 105 insertions(+), 1 deletions(-)
---
diff --git a/s-c-l_445796_545499.patch b/s-c-l_445796_545499.patch
new file mode 100644
index 0000000..79c28e6
--- /dev/null
+++ b/s-c-l_445796_545499.patch
@@ -0,0 +1,97 @@
+Binary files system-config-language-1.3.4/src/gui_detailsDialog.pyc and system-config-language-1.3.4_445796_545499/src/gui_detailsDialog.pyc differ
+Binary files system-config-language-1.3.4/src/gui_errors.pyc and system-config-language-1.3.4_445796_545499/src/gui_errors.pyc differ
+diff -uNr system-config-language-1.3.4/src/gui_install.py system-config-language-1.3.4_445796_545499/src/gui_install.py
+--- system-config-language-1.3.4/src/gui_install.py 2010-08-06 15:50:59.216552668 +0530
++++ system-config-language-1.3.4_445796_545499/src/gui_install.py 2010-08-06 16:06:47.263553716 +0530
+@@ -418,11 +418,6 @@
+ pbar.destroy()
+
+ def install_language(self, mainWindow, grpid):
+- self.selectGroup(grpid)
+-
+- # do depsolve. determine if we've added anything or not.
+- self.checkDeps(mainWindow)
+- self.depDetails(mainWindow)
+
+ # download and verify packages
+ dlpkgs = self.downloadPackages(mainWindow)
+@@ -456,6 +451,7 @@
+ os.close(fd)
+ except:
+ pass
++ gtk.main_quit()
+
+ # run transaction
+ self.runTransaction(mainWindow)
+Binary files system-config-language-1.3.4/src/gui_install.pyc and system-config-language-1.3.4_445796_545499/src/gui_install.pyc differ
+Binary files system-config-language-1.3.4/src/gui_progress.pyc and system-config-language-1.3.4_445796_545499/src/gui_progress.pyc differ
+Binary files system-config-language-1.3.4/src/lang_dict.pyc and system-config-language-1.3.4_445796_545499/src/lang_dict.pyc differ
+diff -uNr system-config-language-1.3.4/src/language_backend.py system-config-language-1.3.4_445796_545499/src/language_backend.py
+--- system-config-language-1.3.4/src/language_backend.py 2010-08-06 15:50:59.218544147 +0530
++++ system-config-language-1.3.4_445796_545499/src/language_backend.py 2010-08-06 16:07:46.306670562 +0530
+@@ -135,3 +135,14 @@
+ # hack for writing information to grub.conf, thanks to Hans de Goede <hdegoede at redhat.com> for mentioning this.
+ # resolves RHBZ bug # 545499
+ (cmdstatus, cmdout)= commands.getstatusoutput('/sbin/new-kernel-pkg --package kernel --dracut --install $(uname -r)')
++
++ (cmdstatus, cmdout)= commands.getstatusoutput('rpm -q kernel kernel-PAE | grep -v kernel-PAE ')
++ kernels=cmdout.split('\n')
++ for kernel in kernels:
++ (cmdstatus, cmdout)= commands.getstatusoutput('/sbin/new-kernel-pkg --package kernel --dracut --install '+kernel)
++
++ (cmdstatus, cmdout)= commands.getstatusoutput('rpm -q kernel kernel-PAE | grep kernel-PAE |grep -v \'package kernel-PAE is not installed\' ')
++ kernels=cmdout.split('\n')
++ for kernel in kernels:
++ (cmdstatus, cmdout)= commands.getstatusoutput('/sbin/new-kernel-pkg --package kernel-PAE --dracut --install '+kernel)
++
+Binary files system-config-language-1.3.4/src/language_backend.pyc and system-config-language-1.3.4_445796_545499/src/language_backend.pyc differ
+diff -uNr system-config-language-1.3.4/src/language_gui.py system-config-language-1.3.4_445796_545499/src/language_gui.py
+--- system-config-language-1.3.4/src/language_gui.py 2010-08-06 15:50:59.222544147 +0530
++++ system-config-language-1.3.4_445796_545499/src/language_gui.py 2010-08-06 16:02:22.118670494 +0530
+@@ -264,22 +264,34 @@
+
+ if not is_RepoError:
+ if not install.is_group_installed(grpid, self.mainWindow):
+- str = _(" language support is not installed, do you want to install it?")
+- str = grpid[:-8] + str
+- str = str.capitalize()
++ 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()
+
+- d = gtk.MessageDialog(self.mainWindow, gtk.DIALOG_MODAL,
++ d = gtk.MessageDialog(self.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()
++ 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:
+- install.install_language (self.mainWindow, grpid)
++ if rc == gtk.RESPONSE_OK:
++ install.install_language (self.mainWindow, grpid)
++ else:
++ pass
+
+ if self.installedLangs == None:
+ self.languageBackend.writeI18N(defaultLang, "", sysfont, sysfontacm)
+Binary files system-config-language-1.3.4/src/language_gui.pyc and system-config-language-1.3.4_445796_545499/src/language_gui.pyc differ
diff --git a/system-config-language.spec b/system-config-language.spec
index e4cd875..81d9ba9 100644
--- a/system-config-language.spec
+++ b/system-config-language.spec
@@ -1,13 +1,14 @@
Summary: A graphical interface for modifying the system language
Name: system-config-language
Version: 1.3.4
-Release: 5%{?dist}
+Release: 6%{?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
Patch2: s-c-l_545499.patch
Patch3: s-c-l_607927.patch
+Patch4: s-c-l_445796_545499.patch
License: GPLv2
Group: System Environment/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,6 +34,7 @@ allows the user to change the default language of the system.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
make %{?_smp_mflags}
@@ -94,6 +96,11 @@ fi
%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
%changelog
+* Mon Aug 9 2010 Naveen Kumar <nkumar at redhat.com>- 1.3.4-6
+- apply patch s-c-l_445796_545499.patch
+- resolves bug #445796
+- resolves bug #545499
+
* Fri Jul 9 2010 Naveen Kumar <nkumar at redhat.com>- 1.3.4-5
- apply patch s-c-l_607927.patch
- resolves bug #607927
More information about the scm-commits
mailing list