Update to 0.125

elfutils-portability.patch

@@ -90,7 +90,7 @@
  libebl_%.map: Makefile
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -11,6 +11,10 @@
+@@ -15,6 +15,10 @@
  	* configure.ac: Add dummy automake conditional to get dependencies
  	for non-generic linker right.  See src/Makefile.am.
  
@@ -101,7 +101,7 @@
  2005-11-18  Roland McGrath  <roland@redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -58,6 +62,17 @@
+@@ -62,6 +66,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -139,7 +139,7 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/configure
 +++ elfutils/configure
-@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.124'
+@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.125'
  PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/'
  
  ac_unique_file="libelf/libelf.h"
@@ -461,7 +461,7 @@
  libcpu_i386_a_SOURCES = i386_dis.c
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -317,6 +317,11 @@
+@@ -322,6 +322,11 @@
  
  2005-05-31  Roland McGrath  <roland@redhat.com>
  
@@ -525,7 +525,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -358,6 +358,11 @@
+@@ -371,6 +371,11 @@
  
  2005-07-21  Roland McGrath  <roland@redhat.com>
  
@@ -647,7 +647,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -178,6 +178,11 @@
+@@ -183,6 +183,11 @@
  	If section content hasn't been read yet, do it before looking for the
  	block size.  If no section data present, infer size of section header.
  
@@ -779,7 +779,7 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -8,6 +8,10 @@
+@@ -42,6 +42,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0@gmx.net>.
  
@@ -790,7 +790,7 @@
  2006-08-08  Ulrich Drepper  <drepper@redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -84,6 +88,10 @@
+@@ -118,6 +122,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -801,7 +801,7 @@
  2006-06-12  Ulrich Drepper  <drepper@redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -432,6 +440,11 @@
+@@ -466,6 +474,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -961,7 +961,7 @@
  cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -405,6 +405,11 @@
+@@ -419,6 +419,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -993,7 +993,7 @@
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -287,6 +287,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -294,6 +294,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -1001,7 +1001,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -327,6 +328,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -334,6 +335,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -1009,7 +1009,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -368,10 +370,10 @@ sbindir = @sbindir@
+@@ -375,10 +377,10 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@

elfutils.spec

@@ -1,4 +1,4 @@
-%define eu_version 0.124
+%define eu_version 0.125
 %define eu_release 1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
@@ -7,6 +7,13 @@
 %define compat 0
 %endif
 
+%if "%fedora" >= "7"
+%define separate_devel_static 1
+%endif
+%if "%rhel" >= "6"
+%define separate_devel_static 1
+%endif
+
 Summary: A collection of utilities and DSOs to handle compiled objects.
 Name: elfutils
 Version: %{eu_version}
@@ -75,6 +82,11 @@ Group: Development/Tools
 License: GPL
 Requires: elfutils-libs = %{version}-%{release}
 Requires: elfutils-libelf-devel = %{version}-%{release}
+Conflicts: elfutils-libelf-devel < %{version}-%{release}
+Conflicts: elfutils-libelf-devel > %{version}-%{release}
+%if !0%{?separate_devel_static}
+Requires: elfutils-devel-static = %{version}-%{release}
+%endif
 
 %description devel
 The elfutils-devel package contains the libraries to create
@@ -83,6 +95,18 @@ higher-level ELF access functionality.  libdw provides access to
 the DWARF debugging information.  libasm provides a programmable
 assembler interface.
 
+%package devel-static
+Summary: Static archives to handle compiled objects.
+Group: Development/Tools
+Requires: elfutils-devel = %{version}-%{release}
+Conflicts: elfutils-devel < %{version}-%{release}
+Conflicts: elfutils-devel > %{version}-%{release}
+Requires: elfutils-libelf-devel-static = %{version}-%{release}
+
+%description devel-static
+The elfutils-devel-static package contains the static archives
+with the code to handle compiled objects.
+
 %package libelf
 Summary: Library to read and write ELF files.
 Group: Development/Tools
@@ -104,6 +128,9 @@ Summary: Development support for libelf
 Group: Development/Tools
 Requires: elfutils-libelf = %{version}-%{release}
 Conflicts: libelf-devel
+%if !0%{?separate_devel_static}
+Requires: elfutils-libelf-devel-static = %{version}-%{release}
+%endif
 
 %description libelf-devel
 The elfutils-libelf-devel package contains the libraries to create
@@ -111,6 +138,17 @@ applications for handling compiled objects.  libelf allows you to
 access the internals of the ELF object file format, so you can see the
 different sections of an ELF file.
 
+%package libelf-devel-static
+Summary: Static archive of libelf
+Group: Development/Tools
+Requires: elfutils-libelf-devel = %{version}-%{release}
+Conflicts: elfutils-libelf-devel < %{version}-%{release}
+Conflicts: elfutils-libelf-devel > %{version}-%{release}
+
+%description libelf-devel-static
+The elfutils-libelf-devel-static package contains
+the static archive for libelf.
+
 %prep
 %setup -q
 
@@ -207,12 +245,15 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/elfutils/libebl.h
 %{_includedir}/elfutils/libdw.h
 %{_includedir}/elfutils/libdwfl.h
-#%{_libdir}/libasm.a
 %{_libdir}/libebl.a
-%{_libdir}/libdw.a
 #%{_libdir}/libasm.so
 %{_libdir}/libdw.so
 
+%files devel-static
+%defattr(-,root,root)
+#%{_libdir}/libasm.a
+%{_libdir}/libdw.a
+
 %files libelf
 %defattr(-,root,root)
 %{_libdir}/libelf-%{version}.so
@@ -223,10 +264,21 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/libelf.h
 %{_includedir}/gelf.h
 %{_includedir}/nlist.h
-%{_libdir}/libelf.a
 %{_libdir}/libelf.so
 
+%files libelf-devel-static
+%defattr(-,root,root)
+%{_libdir}/libelf.a
+
 %changelog
+* Wed Jan 10 2007 Roland McGrath <roland@redhat.com> - 0.125-1
+- Update to 0.125
+  - elflint: Compare DT_GNU_HASH tests.
+  - move archives into -static RPMs
+  - libelf, elflint: better support for core file handling
+  - Really fix libdwfl sorting of modules with 64-bit addresses (#220817).
+- Resolves: RHBZ #220817, RHBZ #213792
+
 * Tue Oct 10 2006 Roland McGrath <roland@redhat.com> - 0.124-1
 - eu-strip -f: copy symtab into debuginfo file when relocs use it (#203000)
 - Update to 0.124