From b4dfabf94e0e1d6f726df52fc57c95fd07d78fc5 Mon Sep 17 00:00:00 2001
From: roland <roland@fedoraproject.org>
Date: Mon, 9 May 2005 00:30:55 +0000
Subject: [PATCH] Fix for new bug in strip -f when byte swapping

---
 elfutils-portability.patch | 4 ++--
 elfutils.spec              | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/elfutils-portability.patch b/elfutils-portability.patch
index 4b7cd11..9cbba8d 100644
--- a/elfutils-portability.patch
+++ b/elfutils-portability.patch
@@ -84,7 +84,7 @@
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
-+  ac_cv_cc_wextra
++  ac_cv_cc_wextra=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
@@ -125,7 +125,7 @@
 +old_CFLAGS="$CFLAGS"
 +CFLAGS="$CFLAGS -Wextra"
 +AC_COMPILE_IFELSE([void foo (void) { }],
-+		  ac_cv_cc_wextra, ac_cv_cc_wextra=no)
++		  ac_cv_cc_wextra=yes, ac_cv_cc_wextra=no)
 +CFLAGS="$old_CFLAGS"])
 +AC_SUBST(WEXTRA)
 +AS_IF([test "x$ac_cv_cc_wextra" = yes], [WEXTRA=-Wextra], [WEXTRA=-W])
diff --git a/elfutils.spec b/elfutils.spec
index 5013543..24afd3a 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -1,5 +1,5 @@
 %define version 0.107
-%define release 1
+%define release 2
 
 %define gpl 0
 %if %{?_with_compat:1}%{!?_with_compat:0}
@@ -26,6 +26,7 @@ Group: Development/Tools
 Source: elfutils-%{version}.tar.gz
 Patch1: elfutils-portability.patch
 Patch2: elfutils-bswap.patch
+Patch3: elfutils-1.07-strip-byteswap.patch
 Obsoletes: libelf libelf-devel
 Requires: elfutils-libelf = %{version}-%{release}
 %if %{gpl}
@@ -116,6 +117,8 @@ sleep 1
 find . \( -name configure -o -name config.h.in \) -print | xargs touch
 %endif
 
+%patch3 -p1
+
 %build
 mkdir build-%{_target_platform}
 cd build-%{_target_platform}
@@ -219,6 +222,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libelf.so
 
 %changelog
+* Sun May  8 2005 Roland McGrath <roland@redhat.com> - 0.107-2
+- fix strip -f byte-swapping bug
+
 * Sun May  8 2005 Roland McGrath <roland@redhat.com> - 0.107-1
 - update to 0.107
   - readelf: improve DWARF output format