[prelink/f16] 0.4.6-3

[Jakub Jelinek]

commit 46cbe03da1d0326b60cd19f6aa1e3dab7a9ac9c3
Author: Jakub Jelinek <jakub at redhat.com>
Date:   Wed Oct 12 17:45:50 2011 +0200

    0.4.6-3

 .gitignore   |    1 +
 prelink.spec |   11 ++++++++---
 sources      |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 08b1020..195ced3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ prelink-20101123.tar.bz2
 /prelink-20110511.tar.bz2
 /prelink-20110622.tar.bz2
 /prelink-20110826.tar.bz2
+/prelink-20111012.tar.bz2
diff --git a/prelink.spec b/prelink.spec
index bd6bbd1..d057d2a 100644
--- a/prelink.spec
+++ b/prelink.spec
@@ -1,11 +1,11 @@
 Summary: An ELF prelinking utility
 Name: prelink
 Version: 0.4.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 %global svnver 195
 License: GPLv2+
 Group: System Environment/Base
-%define date 20110826
+%define date 20111012
 # svn export svn://sourceware.org/svn/prelink/trunk@%{svnver} prelink
 # tar cf - prelink | bzip2 -9 > prelink-%{date}.tar.bz2
 Source: http://people.redhat.com/jakub/prelink/prelink-%{date}.tar.bz2
@@ -34,7 +34,7 @@ and thus programs come up faster.
 sed -i -e '/^prelink_LDADD/s/$/ -lpthread/' src/Makefile.{am,in}
 %configure --disable-shared
 make %{_smp_mflags}
-%if 0%{?fedora} >= 13
+%if 0%{?fedora} >= 13 || 0%{?rhel} >= 7
 %define testcc CC='gcc -Wl,--add-needed' CXX='g++ -Wl,--add-needed'
 %else
 %define testcc %{nil}
@@ -103,6 +103,11 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
 
 %changelog
+* Wed Oct 12 2011 Jakub Jelinek <jakub at redhat.com> 0.4.6-3
+- add --layout-page-size=N option, default to --layout-page-size=32768
+  on AMD Bulldozer (#739460)
+- handle 0%%{?rhel} >= 7 like 0%%{?fedora} >= 13
+
 * Fri Aug 26 2011 Jakub Jelinek <jakub at redhat.com> 0.4.6-2
 - fix cxx3.sh for ppc
 
diff --git a/sources b/sources
index a423304..23f8a2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d9ecbd8193d9aa3b8cbc3bf76db7aeff  prelink-20110826.tar.bz2
+f5aaf347432d677c293e5e3399ba4fdf  prelink-20111012.tar.bz2