2.3.5-5

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 6dce1cde3b480533444d1ff671406c090732f200..a2351e222d69fabed9986a0a6dfd32598c29e6c9 100644 (file)
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 4
+%define glibcrelease 5
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 sparc64 ppc ppc64
@@ -557,9 +557,7 @@ $GCC -static -L. -Os ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_tar
 %ifarch i386
     -DARCH_386 \
 %endif
-%ifarch %{nptlarches}
     '-DLIBTLS="/%{_lib}/tls/"' \
-%endif
     '-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' \
     '-DLD_SO_CONF="/etc/ld.so.conf"' \
     '-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"'
@@ -1341,6 +1339,13 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue May  3 2005 Jakub Jelinek <jakub@redhat.com> 2.3.5-5
+- update from CVS
+  - add some more UTF-8 locales (#156115)
+- clean up /lib64/tls instead of /lib/tls on x86-64, s390x and
+  ppc64 in glibc_post_upgrade (#156656)
+- fix posix_fallocate{,64} (#156289)
+
 * Thu Apr 28 2005 Jakub Jelinek <jakub@redhat.com> 2.3.5-4
 - update from CVS
   - fix nscd cache pruning (#150748)

diff --git a/fedora/glibc_post_upgrade.c b/fedora/glibc_post_upgrade.c
index 5de864cf05b65ebdf61fa987534adc5bb0d56bb0..21d990a2899e8a59277736a50c13bbb8232e64a0 100644 (file)
--- a/fedora/glibc_post_upgrade.c
+++ b/fedora/glibc_post_upgrade.c
@@ -45,7 +45,10 @@ main (void)
 #ifdef __i386__
   const char *remove_dirs[] = { "/lib/tls", "/lib/i686", "/lib/tls/i486", "/lib/tls/i586", "/lib/tls/i686" };
 #else
-  const char *remove_dirs[] = { "/lib/tls" };
+#ifndef LIBTLS
+#define LIBTLS "/lib/tls"
+#endif
+  const char *remove_dirs[] = { LIBTLS };
 #endif
   for (j = 0; j < sizeof (remove_dirs) / sizeof (remove_dirs[0]); ++j)
     {