From a0a6ee336418d45cf0ac40d93ad72fe3b8ac21e7 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Jan 15 2014 14:42:09 +0000 Subject: Update to 1.4.1 release --- diff --git a/.gitignore b/.gitignore index 2724653..0d53979 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ system-config-language-1.3.4.tar.bz2 /system-config-language-1.3.5.tar.bz2 /system-config-language-1.3.6.tar.bz2 /system-config-language-1.4.0.tar.bz2 +/system-config-language-1.4.1.tar.bz2 diff --git a/bug-1033050.patch b/bug-1033050.patch deleted file mode 100644 index e8070ac..0000000 --- a/bug-1033050.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rup system-config-language-1.4.0-org/src/language_tui.py system-config-language-1.4.0/src/language_tui.py ---- system-config-language-1.4.0-org/src/language_tui.py 2013-11-21 18:31:28.226173159 +0530 -+++ system-config-language-1.4.0/src/language_tui.py 2013-11-21 18:48:02.270195841 +0530 -@@ -103,6 +103,9 @@ class LanguageWindow: - if button2 == "ok": - screen.finish() - install.install_language (grpid) -+ elif button2 == "cancel": -+ screen.finish() -+ return -1 - - if self.installedLangs == None: - languageBackend.writeI18N(defaultLang, "", sysfont, sysfontacm) - diff --git a/bug-1039836.patch b/bug-1039836.patch deleted file mode 100644 index 7b2670d..0000000 --- a/bug-1039836.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -rup system-config-language-1.4.0-org/src/locale-list system-config-language-1.4.0/src/locale-list ---- system-config-language-1.4.0-org/src/locale-list 2013-12-10 11:38:39.158099944 +0530 -+++ system-config-language-1.4.0/src/locale-list 2013-12-10 11:40:17.808102195 +0530 -@@ -98,7 +98,7 @@ ne_NP.UTF-8 utf8 latarcyrheb-sun16 Nepal - nb_NO.UTF-8 utf8 latarcyrheb-sun16 Norwegian - Norsk - nn_NO.UTF-8 utf8 latarcyrheb-sun16 Norwegian, Nynorsk (Norway) - Norsk - oc_FR 8859-15 lat0-sun16 Occitan (France) --or_IN.UTF-8 utf8 latarcyrheb-sun16 Oriya (India) -+or_IN.UTF-8 utf8 latarcyrheb-sun16 Odia (India) - fa_IR.UTF-8 utf8 latarcyrheb-sun16 Persian (Iran) - pl_PL.UTF-8 utf8 latarcyrheb-sun16 Polish - pt_BR.UTF-8 utf8 latarcyrheb-sun16 Portuguese (Brasil) - diff --git a/bug-858059.patch b/bug-858059.patch deleted file mode 100644 index af294c5..0000000 --- a/bug-858059.patch +++ /dev/null @@ -1,55 +0,0 @@ -Only in system-config-language-1.4.0/src: gui_detailsDialog.pyc -Only in system-config-language-1.4.0/src: gui_errors.pyc -diff -rup system-config-language.org/src/gui_install.py system-config-language-1.4.0/src/gui_install.py ---- system-config-language.org/src/gui_install.py 2013-11-07 15:21:19.951650313 +0530 -+++ system-config-language-1.4.0/src/gui_install.py 2013-11-07 15:28:11.590659705 +0530 -@@ -115,7 +115,8 @@ class guiInstall(yum.YumBase): - pass - return True - else: -- raise yum.Errors.GroupsError, "No Group named %s exists" % grpid -+ return None -+ - - if thisgroup.installed: - return True -Only in system-config-language-1.4.0/src: gui_install.py.~1~ -Only in system-config-language-1.4.0/src: gui_install.py.~2~ -Only in system-config-language-1.4.0/src: gui_install.py.~3~ -Only in system-config-language-1.4.0/src: gui_install.pyc -Only in system-config-language-1.4.0/src: gui_progress.pyc -Only in system-config-language-1.4.0/src: lang_dict.pyc -Only in system-config-language-1.4.0/src: language_backend.pyc -diff -rup system-config-language.org/src/language_gui.py system-config-language-1.4.0/src/language_gui.py ---- system-config-language.org/src/language_gui.py 2013-11-07 15:21:19.951650313 +0530 -+++ system-config-language-1.4.0/src/language_gui.py 2013-11-07 15:29:04.568660914 +0530 -@@ -266,7 +266,10 @@ class childWindow: - return -1 - - if not is_RepoError: -- if not install.is_group_installed(grpid, self.mainWindow): -+ is_install = install.is_group_installed(grpid, self.mainWindow) -+ if is_install == None: -+ return 0 -+ if not is_install: - pass - try: - install.selectGroup(grpid) -Only in system-config-language-1.4.0/src: language_gui.py.~1~ -Only in system-config-language-1.4.0/src: language_gui.py.~2~ -Only in system-config-language-1.4.0/src: language_gui.pyc -Only in system-config-language-1.4.0/src: language_tui.pyc -diff -rup system-config-language.org/src/tui_install.py system-config-language-1.4.0/src/tui_install.py ---- system-config-language.org/src/tui_install.py 2013-11-07 15:21:19.950650313 +0530 -+++ system-config-language-1.4.0/src/tui_install.py 2013-11-07 15:48:19.756687273 +0530 -@@ -392,7 +392,7 @@ Remove %5.5s Package(s) - - def is_group_installed(self, grpid): - if not self.comps.has_group(grpid): -- raise Errors.GroupsError, "No Group named %s exists" % grpid -+ return True - - thisgroup = self.comps.return_group(grpid) - -Only in system-config-language-1.4.0/src: tui_install.py.~1~ -Only in system-config-language-1.4.0/src: tui_install.pyc diff --git a/sources b/sources index 68ebfb6..ad888c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c8ff04e7edfa167e8073f879521697df system-config-language-1.4.0.tar.bz2 +52754e9e0d66383d573a175155c9460e system-config-language-1.4.1.tar.bz2 diff --git a/system-config-language.spec b/system-config-language.spec index 69d6d60..0cc1ed6 100644 --- a/system-config-language.spec +++ b/system-config-language.spec @@ -1,13 +1,10 @@ Summary: A graphical interface for modifying the system language Name: system-config-language -Version: 1.4.0 -Release: 6%{?dist} +Version: 1.4.1 +Release: 1%{?dist} URL: https://fedorahosted.org/system-config-language/ Source0: https://fedorahosted.org/releases/s/y/system-config-language/%{name}-%{version}.tar.bz2 License: GPLv2+ -Patch1: bug-858059.patch -Patch2: bug-1033050.patch -Patch3: bug-1039836.patch BuildArch: noarch BuildRequires: desktop-file-utils @@ -27,9 +24,6 @@ allows the user to change the default language of the system. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %configure @@ -73,16 +67,19 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language %changelog +* Wed Jan 15 2014 Parag Nemade - 1.4.1-1 +- Update to 1.4.1 release + * Tue Dec 10 2013 Anish Patil - 1.4.0-6 - Fixed bug-1039836.patch * Thu Nov 21 2013 Anish Patil - 1.4.0-5 - Fixed bug-1033050 -* Tue Nov 07 2013 Anish Patil - 1.4.0-4 +* Thu Nov 07 2013 Anish Patil - 1.4.0-4 - Added patch 858059 in specfile -* Tue Nov 07 2013 Anish Patil - 1.4.0-3 +* Thu Nov 07 2013 Anish Patil - 1.4.0-3 - Resolves:#858059 - selectGroup:GroupsError: No Group named portuguese-support exists * Sun Aug 04 2013 Fedora Release Engineering - 1.4.0-2