Fix an issue with the treatment of en_US

This commit is contained in:
Matthias Clasen 2007-10-01 17:12:32 +00:00
parent f84aad018c
commit 3a34cf00ae
2 changed files with 19 additions and 1 deletions

12
specialcase-en.patch Normal file
View File

@ -0,0 +1,12 @@
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;

View File

@ -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 @@ License: GPL
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 @@ locale changes.
%prep
%setup -q
%patch0 -p1 -b .kde
%patch1 -p1 -b .specialcase-en
%build
%configure
@ -43,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/xdg/autostart/user-dirs-update-gtk.desktop
%changelog
* Mon Oct 1 2007 Matthias Clasen <mclasen@redhat.com> - 0.6-2
- Fix the special case for en_US (#307881)
* Tue Aug 21 2007 Alexander Larsson <alexl@redhat.com> - 0.6-1
- Update to 0.6 (new translations)