rpms/gnome-user-share/devel gnome-user-share-2.29.xx-httpd-dont-localize-realm.patch, NONE, 1.1 gnome-user-share.spec, 1.69, 1.70

Tomas Bzatek tbzatek at fedoraproject.org
Mon Feb 22 14:37:54 UTC 2010


Author: tbzatek

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

Modified Files:
	gnome-user-share.spec 
Added Files:
	gnome-user-share-2.29.xx-httpd-dont-localize-realm.patch 
Log Message:
* Mon Feb 22 2010 Tomas Bzatek <tbzatek at redhat.com> 2.28.1-5
- Don't use localized realm string when starting httpd


gnome-user-share-2.29.xx-httpd-dont-localize-realm.patch:
 http.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE gnome-user-share-2.29.xx-httpd-dont-localize-realm.patch ---
>From 1a2aff08c16c87fcae10563acd9485624a5e262d Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Mon, 22 Feb 2010 14:26:06 +0100
Subject: [PATCH] Don't use localized realm string when starting httpd

---
 src/http.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/http.c b/src/http.c
index 367394a..3367d2a 100644
--- a/src/http.c
+++ b/src/http.c
@@ -369,7 +369,7 @@ spawn_httpd (int port, pid_t *pid_out)
 	free5 = env[i++] = g_strdup_printf ("XDG_PUBLICSHARE_DIR=%s", public_dir);
 	free6 = env[i++] = g_strdup_printf ("XDG_CONFIG_HOME=%s", g_get_user_config_dir ());
 	free7 = env[i++] = g_strdup_printf ("GUS_SHARE_NAME=%s", get_share_name ());
-	free8 = env[i++] = g_strdup_printf ("GUS_LOGIN_LABEL=%s", _("Please log in as the user guest"));
+	free8 = env[i++] = g_strdup_printf ("GUS_LOGIN_LABEL=%s", "Please log in as the user guest");
 	free9 = env[i++] = g_strdup_printf ("HTTP_MODULES_PATH=%s",get_httpd_modules_path ());
 	env[i++] = "LANG=C";
 	env[i] = NULL;
-- 
1.7.0



Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- gnome-user-share.spec	14 Feb 2010 06:11:27 -0000	1.69
+++ gnome-user-share.spec	22 Feb 2010 14:37:54 -0000	1.70
@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 2.28.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
@@ -16,6 +16,7 @@ Patch2: 0001-Use-same-directories-in-nau
 BuildRequires: intltool automake autoconf libtool
 # https://bugzilla.redhat.com/show_bug.cgi?id=533977
 Patch3: 0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch
+Patch4: gnome-user-share-2.29.xx-httpd-dont-localize-realm.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +61,7 @@ The program also allows to share files u
 %patch1 -p1 -b .cluebar
 %patch2 -p1 -b .dirs
 %patch3 -p1 -b .exit-crash
+%patch4 -p1 -b .httpd-realm
 
 autoreconf -f -i
 
@@ -142,6 +144,9 @@ gtk-update-icon-cache --quiet %{_datadir
 %{_libdir}/nautilus/extensions-2.0/*.so
 
 %changelog
+* Mon Feb 22 2010 Tomas Bzatek <tbzatek at redhat.com> 2.28.1-5
+- Don't use localized realm string when starting httpd
+
 * Sun Feb 14 2010 Matthias Clasen <mclasen at redhat.com> 2.28.1-4
 - Modernize scripts
 - Fix build



More information about the scm-commits mailing list