From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 25 Jun 2008 19:33:49 +0000 (+0000)
Subject: [BZ #5814]
X-Git-Tag: cvs/fedora-glibc-20080703T1203~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a40fbc8dca728323f29c437ef95b5f125b9b40f7;p=thirdparty%2Fglibc.git

[BZ #5814]

2008-06-25  Ulrich Drepper  <drepper@redhat.com>
	[BZ #5814]
	* locales/fi_FI: Fix separator for hours, minutes, and seconds.
---

diff --git a/configure b/configure
index a43f850f512..6ffe5e64da5 100755
--- a/configure
+++ b/configure
@@ -6451,7 +6451,7 @@ else
 int foo;
 main () { return 0;}
 EOF
-if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -fstack-protector
+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Werror -fstack-protector
 			    -o conftest conftest.c 1>&5'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
diff --git a/configure.in b/configure.in
index ef9893c800a..cd08a23e29b 100644
--- a/configure.in
+++ b/configure.in
@@ -1638,7 +1638,7 @@ cat > conftest.c <<EOF
 int foo;
 main () { return 0;}
 EOF
-if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -fstack-protector
+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Werror -fstack-protector
 			    -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD])
 then
   libc_cv_ssp=yes
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 4d0b73eda29..df2874c3504 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-25  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5814]
+	* locales/fi_FI: Fix separator for hours, minutes, and seconds.
+
 2008-06-24  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/iso14651_t1_common: Add support for Gurumukhi script.
diff --git a/localedata/locales/fi_FI b/localedata/locales/fi_FI
index 9ffe8f103eb..a7920acb134 100644
--- a/localedata/locales/fi_FI
+++ b/localedata/locales/fi_FI
@@ -193,13 +193,15 @@ mon      "<U0074><U0061><U006D><U006D><U0069><U006B><U0075><U0075>";/
          "<U006D><U0061><U0072><U0072><U0061><U0073><U006B><U0075><U0075>";/
          "<U006A><U006F><U0075><U006C><U0075><U006B><U0075><U0075>"
 d_t_fmt  "<U0025><U0061><U0020><U0025><U0065><U002E><U0020><U0025><U0042>/
-<U0074><U0061><U0020><U0025><U0059><U0020><U0025><U0054>"
+<U0074><U0061><U0020><U0025><U0059><U0020><U0025><U0048><U002E><U0025>/
+<U004D><U002E><U0025><U0053>"
 d_fmt    "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059>"
-t_fmt    "<U0025><U0054>"
+t_fmt    "<U0025><U0048><U002E><U0025><U004D><U002E><U0025><U0053>"
 am_pm    "";""
 t_fmt_ampm  ""
 date_fmt       "<U0025><U0061><U0020><U0025><U002D><U0064><U002E><U0025>/
-<U002D><U006D><U002E><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U007A>"
+<U002D><U006D><U002E><U0025><U0059><U0020><U0025><U0048><U002E><U0025>/
+<U004D><U002E><U0025><U0053><U0020><U0025><U007A>"
 first_weekday 2 % Monday
 first_workday 2 % Monday
 END LC_TIME