[system-config-language/f18] Build for 1.3.5-13 version

anish anishpatil at fedoraproject.org
Thu Sep 20 11:11:55 UTC 2012


commit 63848177c319008cbdff50082841fb0c7f54b030
Author: Anish Patil <apatil at redhat.com>
Date:   Thu Sep 20 16:39:18 2012 +0530

    Build for 1.3.5-13 version

 bug-858168-858059.patch     |   32 ++++++++++++++++++++++++++++++++
 system-config-language.spec |    7 ++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/bug-858168-858059.patch b/bug-858168-858059.patch
new file mode 100644
index 0000000..b73a738
--- /dev/null
+++ b/bug-858168-858059.patch
@@ -0,0 +1,32 @@
+diff -rup system-config-language-1.3.5-old/src/gui_install.py system-config-language-1.3.5/src/gui_install.py
+--- system-config-language-1.3.5-old/src/gui_install.py	2012-09-20 16:11:30.566323906 +0530
++++ system-config-language-1.3.5/src/gui_install.py	2012-09-20 16:15:43.472315479 +0530
+@@ -244,8 +244,7 @@ class guiInstall(yum.YumBase):
+                 self.last = 0
+ 
+             def _do_start(self, now):
+-                txt = _("Downloading %s") %(urllib2.unquote(self.basename),)
+-                self.pbar.set_markup("<i>%s</i>" %(txt,))
++                self.pbar.set_markup("<i>Downloading packages...</i>")
+ 
+             def _do_end(self, amount_read, now=None):
+                 self.current += 1
+Only in system-config-language-1.3.5/src: gui_install.py~
+diff -rup system-config-language-1.3.5-old/src/language_gui.py system-config-language-1.3.5/src/language_gui.py
+--- system-config-language-1.3.5-old/src/language_gui.py	2012-09-20 16:11:30.566323906 +0530
++++ system-config-language-1.3.5/src/language_gui.py	2012-09-20 16:14:21.199318220 +0530
+@@ -268,8 +268,11 @@ class childWindow:
+             if not is_RepoError:   
+                 if not install.is_group_installed(grpid, self.mainWindow):
+                     pass
+-                
+-            install.selectGroup(grpid)
++            try:    
++                install.selectGroup(grpid)
++            except:
++                #Do nothing from Fedora 18 group support for languages have been removed
++                pass
+             # do depsolve.  determine if we've added anything or not.
+             install.checkDeps(self.mainWindow)
+             install.depDetails(self.mainWindow)    
+Only in system-config-language-1.3.5/src: language_gui.py~
diff --git a/system-config-language.spec b/system-config-language.spec
index 7337428..f366a3d 100644
--- a/system-config-language.spec
+++ b/system-config-language.spec
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
 Version: 1.3.5
-Release: 12%{?dist}
+Release: 13%{?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
@@ -11,6 +11,7 @@ Patch3: s-c-l-681802_681805.patch
 Patch4: s-c-l-700967.patch
 Patch5: s-c-l-803851.patch
 Patch6: s-c-l-817083.patch
+Patch7: bug-858168-858059.patch
 License: GPLv2
 Group: System Environment/Base
 BuildArch: noarch
@@ -37,6 +38,7 @@ allows the user to change the default language of the system.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 make %{?_smp_mflags}
@@ -91,6 +93,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
 
 %changelog
+* Thu Sep 20 2012 Anish Patil <apatil at redhat.com> - 1.3.5-13
+- Fixed bugs 858168,858059,858056
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list