summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2005-05-03 09:40:10 +0000
committerJakub Jelinek <jakub@redhat.com>2005-05-03 09:40:10 +0000
commitc5636422a9fbe30e181cb1ecd1a86d53e3797d8f (patch)
tree794370f7399e00c4c1fc74ca54e95bda0f7fb505
parentcd6fa64a21feb8802d53edd5d1aa49b58398f74c (diff)
-rw-r--r--fedora/glibc.spec.in11
-rw-r--r--fedora/glibc_post_upgrade.c5
2 files changed, 12 insertions, 4 deletions
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 6dce1cde3b..a2351e222d 100644
--- 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 5de864cf05..21d990a289 100644
--- 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)
{