rpms/xdg-user-dirs-gtk/devel specialcase-en.patch, NONE, 1.1 xdg-user-dirs-gtk.spec, 1.6, 1.7

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/pkgs/rpms/xdg-user-dirs-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25601

Modified Files:
	xdg-user-dirs-gtk.spec 
Added Files:
	specialcase-en.patch 
Log Message:
Fix an issue with the treatment of en_US


specialcase-en.patch:

--- NEW FILE specialcase-en.patch ---
diff -up xdg-user-dirs-gtk-0.6/update.c.specialcase-en xdg-user-dirs-gtk-0.6/update.c
--- xdg-user-dirs-gtk-0.6/update.c.specialcase-en	2007-10-01 13:02:51.000000000 -0400
+++ xdg-user-dirs-gtk-0.6/update.c	2007-10-01 13:03:03.000000000 -0400
@@ -45,7 +45,7 @@ has_xdg_translation (void)
 
   locale = setlocale (LC_MESSAGES, NULL);
 
-  if (strcmp (locale, "en_US") == 0 ||
+  if (strncmp (locale, "en_US", 5) == 0 ||
       strcmp (locale, "C") == 0)
     return TRUE;
   


Index: xdg-user-dirs-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-user-dirs-gtk/devel/xdg-user-dirs-gtk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xdg-user-dirs-gtk.spec	21 Aug 2007 11:57:08 -0000	1.6
+++ xdg-user-dirs-gtk.spec	1 Oct 2007 17:12:32 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xdg-user-dirs-gtk
 Version:	0.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Gnome integration of special directories
 
 Group:		User Interface/Desktops
@@ -8,6 +8,8 @@
 URL:		http://freedesktop.org/wiki/Software_2fxdg_2duser_2ddirs
 Source0:	http://download.gnome.org/sources/xdg-user-dirs-gtk/%{version}/%{name}-%{version}.tar.gz
 Patch0:         kde.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=12640
+Patch1:		specialcase-en.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gettext, gtk2-devel, pkgconfig, perl-XML-Parser, xdg-user-dirs
@@ -21,6 +23,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .kde
+%patch1 -p1 -b .specialcase-en
 
 %build
 %configure
@@ -43,6 +46,9 @@
 %config(noreplace) %{_sysconfdir}/xdg/autostart/user-dirs-update-gtk.desktop
 
 %changelog
+* Mon Oct  1 2007 Matthias Clasen <mclasen at redhat.com> - 0.6-2
+- Fix the special case for en_US  (#307881)
+
 * Tue Aug 21 2007 Alexander Larsson <alexl at redhat.com> - 0.6-1
 - Update to 0.6 (new translations)