rpms/gnome-user-share/F-11 do-not-localize-realms.patch, NONE, 1.1 gnome-user-share.spec, 1.53, 1.54

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/gnome-user-share/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13647

Modified Files:
	gnome-user-share.spec 
Added Files:
	do-not-localize-realms.patch 
Log Message:
* Wed Aug 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.0-3
- Do not localize realm in passwd files (#500123)


do-not-localize-realms.patch:
 file-share-properties.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE do-not-localize-realms.patch ---
>From f77498214f945c988a0bcbe570782dcaf37e771d Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 26 Jun 2009 09:30:42 +0000
Subject: Bug 586755 – Localized realm in the passwd file doesn't work

And apparently, they're not supposed to either... So remove the
translation for the realm instead.
---
diff --git a/src/file-share-properties.c b/src/file-share-properties.c
index 2b9cd2e..4d69a62 100644
--- a/src/file-share-properties.c
+++ b/src/file-share-properties.c
@@ -32,7 +32,7 @@
 
 #include "user_share-private.h"
 
-#define REALM N_("Please log in as the user guest")
+#define REALM "Please log in as the user guest"
 #define USER "guest"
 
 static GtkBuilder* builder;
@@ -47,10 +47,10 @@ write_out_password (const char *password)
     char *filename;
     FILE *file;
 
-    to_hash = g_strdup_printf ("%s:%s:%s", USER, _(REALM), password);
+    to_hash = g_strdup_printf ("%s:%s:%s", USER, REALM, password);
     ascii_digest = g_compute_checksum_for_string (G_CHECKSUM_MD5, to_hash, strlen (to_hash));
     g_free (to_hash);
-    line = g_strdup_printf ("%s:%s:%s\n", USER, _(REALM), ascii_digest);
+    line = g_strdup_printf ("%s:%s:%s\n", USER, REALM, ascii_digest);
     g_free (ascii_digest);
 
     filename = g_build_filename (g_get_user_config_dir (), "user-share", "passwd", NULL);
--
cgit v0.8.2


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-user-share/F-11/gnome-user-share.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- gnome-user-share.spec	6 Apr 2009 03:11:59 -0000	1.53
+++ gnome-user-share.spec	20 Aug 2009 11:21:58 -0000	1.54
@@ -1,13 +1,16 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 2.26.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-user-share/2.25/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=578090
 Patch0: menu-path.patch
+# Localized realm in the passwd file doesn't work3
+# http://bugzilla.gnome.org/show_bug.cgi?id=586755
+Patch1: do-not-localize-realms.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd >= 2.2.0
@@ -46,6 +49,7 @@ The program also allows to share files u
 %prep
 %setup -q
 %patch0 -p1 -b .menu-path
+%patch1 -p1 -b .realm-localization
 
 %build
 %configure
@@ -123,6 +127,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Wed Aug 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.0-3
+- Do not localize realm in passwd files (#500123)
+
 * Sun Apr  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
 - Fix a menu reference in the docs (#494253)