summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2009-08-24 10:25:12 +0200
committerAndreas Schwab <schwab@redhat.com>2009-08-24 10:27:57 +0200
commit9aadad69ed7b1a24947f8d5cf878f94096317f81 (patch)
treec63c3a00dbe3aa53c31d92c68bed70fa5d8f9e18
parentMerge commit 'origin/master' into fedora/master (diff)
downloadglibc-fedora/glibc-2.10.90-15.tar.gz
glibc-fedora/glibc-2.10.90-15.tar.bz2
glibc-fedora/glibc-2.10.90-15.zip
-rw-r--r--fedora/glibc.spec.in13
1 files changed, 10 insertions, 3 deletions
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 5e9ee70541..d85f2a333f 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -21,7 +21,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
-Release: 14
+Release: 15
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -62,12 +62,14 @@ BuildRequires: gcc >= 3.2
%else
%define nptl_target_cpu %{_target_cpu}
%endif
-# Need AS_NEEDED directive
-# Need --hash-style=* support
%ifarch %{multiarcharches}
# Need STT_IFUNC support
BuildRequires: binutils >= 2.19.51.0.10
+# Earlier releases have broken support for IRELATIVE relocations
+Conflicts: prelink < 0.4.2
%else
+# Need AS_NEEDED directive
+# Need --hash-style=* support
BuildRequires: binutils >= 2.17.50.0.2-5
%endif
BuildRequires: gcc >= 3.2.1-5
@@ -1023,6 +1025,11 @@ rm -f *.filelist*
%endif
%changelog
+* Mon Aug 24 2009 Andreas Schwab <schwab@redhat.com> - 2.10.90-15
+- Update from master.
+ - fix fortify failure with longjmp from alternate stack (#512103).
+- Add conflict with prelink (#509655).
+
* Mon Aug 17 2009 Andreas Schwab <schwab@redhat.com> - 2.10.90-14
- Update from master.
- fix pthread_cond_signal (#516469)