[prelink/f17: 5/5] Merge branch 'f16' into f17

[Dennis Gilmore]

commit 810b5edf702d39718804ac9a4ada520555f24492
Merge: 22e75d6 46cbe03
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Thu Feb 9 15:07:37 2012 -0600

    Merge branch 'f16' into f17
    
    Conflicts:
    	prelink.spec

 .gitignore   |    2 ++
 prelink.spec |   35 +++++++++++++++++++++++++++--------
 sources      |    2 +-
 3 files changed, 30 insertions(+), 9 deletions(-)
---
diff --cc prelink.spec
index 52a1215,d057d2a..e1d8aee
--- a/prelink.spec
+++ b/prelink.spec
@@@ -1,10 -1,13 +1,13 @@@
  Summary: An ELF prelinking utility
  Name: prelink
- Version: 0.4.5
- Release: 5%{?dist}
+ Version: 0.4.6
 -Release: 3%{?dist}
++Release: 4%{?dist}
+ %global svnver 195
  License: GPLv2+
  Group: System Environment/Base
- %define date 20110622
+ %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
  Source2: prelink.conf
  Source3: prelink.cron
@@@ -94,12 -103,23 +99,26 @@@ touch /var/lib/prelink/forc
  %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
  
  %changelog
- * Mon Feb  6 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.4.5-5
- - Drop Exclusive arch, it works on all primary and should on all currently active secondary arches
- 
- * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-4
++* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.6-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
+ * 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
+ 
+ * Fri Aug 26 2011 Jakub Jelinek <jakub at redhat.com> 0.4.6-1
+ - enable for arm (#733089)
+   - adjust arm default dynamic linker
+   - fix up fast PIE detection to handle PT_LOPROC ... PT_HIPROC phdrs
+     before PT_PHDR
+   - disable cxx{1,2}.sh test checking for conflict removal on arm
+     due to EABI weirdnesses, add new cxx3.sh test that tests conflict
+     removal even on arm
+ 
  * Wed Jun 22 2011 Jakub Jelinek <jakub at redhat.com> 0.4.5-3
  - handle DW_OP_GNU_parameter_ref