[gnome-boxes] Add upstream patch for rhbz#963464

Christophe Fergeau teuf at fedoraproject.org
Thu May 16 11:48:40 UTC 2013


commit 1406c21611d813f6e5e23bf493d15c0adc182c7d
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Thu May 16 13:38:33 2013 +0200

    Add upstream patch for rhbz#963464

 ...staller-Handle-locales-with-.UTF-8-suffix.patch |   29 ++++++++++++++++++++
 gnome-boxes.spec                                   |    7 ++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/0001-installer-Handle-locales-with-.UTF-8-suffix.patch b/0001-installer-Handle-locales-with-.UTF-8-suffix.patch
new file mode 100644
index 0000000..02c59ed
--- /dev/null
+++ b/0001-installer-Handle-locales-with-.UTF-8-suffix.patch
@@ -0,0 +1,29 @@
+From 7b7a9a849da23846d17a843688ed97de229eb1cb Mon Sep 17 00:00:00 2001
+From: "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org>
+Date: Thu, 16 May 2013 00:12:24 +0300
+Subject: [PATCH] installer: Handle locales with '.UTF-8' suffix
+
+Apparently its not just '.utf8' but also '.UTF-8' suffix thats used as
+suffix in locale names. Better make sure we strip that too before giving
+the string to libosinfo.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=700415
+---
+ src/unattended-installer.vala | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/unattended-installer.vala b/src/unattended-installer.vala
+index bbc2436..36233fd 100644
+--- a/src/unattended-installer.vala
++++ b/src/unattended-installer.vala
+@@ -878,6 +878,7 @@ private string get_preferred_language () {
+         }
+ 
+         var lang = system_langs[0].replace (".utf8", "");
++        lang = lang.replace (".UTF-8", "");
+         debug ("No media language, using %s locale", lang);
+ 
+         return lang;
+-- 
+1.8.2.1
+
diff --git a/gnome-boxes.spec b/gnome-boxes.spec
index 556d801..83ede68 100644
--- a/gnome-boxes.spec
+++ b/gnome-boxes.spec
@@ -3,13 +3,14 @@
 
 Name:		gnome-boxes
 Version:	3.8.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A simple GNOME 3 application to access remote or virtual systems
 
 Group:		Applications/Emulators
 License:	LGPLv2+
 URL:		https://live.gnome.org/Boxes
 Source0:	http://download.gnome.org/sources/%{name}/%{url_ver}/%{name}-%{version}.tar.xz
+Patch0:		0001-installer-Handle-locales-with-.UTF-8-suffix.patch
 
 BuildRequires:  libgovirt-devel
 BuildRequires:	intltool
@@ -56,6 +57,7 @@ gnome-boxes lets you easily create, setup, access, and use:
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 #fedora-legal and the fedora board permit logos to be enabled
@@ -103,6 +105,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gnome-shell/search-providers/gnome-boxes-search-provider.ini
 
 %changelog
+* Thu May 16 2013 Christophe Fergeau <cfergeau at redhat.com> 3.8.2-2
+- Add upstream patch for rhbz#963464
+
 * Tue May 14 2013 Zeeshan Ali <zeenix at redhat.com> - 3.8.2-1
 - Update to 3.8.2.
 


More information about the scm-commits mailing list