diff --git a/do-not-localize-realms.patch b/do-not-localize-realms.patch new file mode 100644 index 0000000..c310e8d --- /dev/null +++ b/do-not-localize-realms.patch @@ -0,0 +1,36 @@ +From f77498214f945c988a0bcbe570782dcaf37e771d Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +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 diff --git a/gnome-user-share.spec b/gnome-user-share.spec index 8ef8e93..b593eb9 100644 --- a/gnome-user-share.spec +++ b/gnome-user-share.spec @@ -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 using ObexFTP over Bluetooth. %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 - 2.26.0-3 +- Do not localize realm in passwd files (#500123) + * Sun Apr 5 2009 Matthias Clasen - 2.26.0-2 - Fix a menu reference in the docs (#494253)