- added -reg_eip.patch (from fedora)

Changed files:
    e2retrieve-reg_eip.patch -> 1.1
    e2retrieve.spec -> 1.8

diff --git a/e2retrieve-reg_eip.patch b/e2retrieve-reg_eip.patch
new file mode 100644 (file)
index 0000000..ea18952
--- /dev/null
+++ b/e2retrieve-reg_eip.patch
@@ -0,0 +1,24 @@
+http://cvs.fedoraproject.org/viewvc/F-13/hddtemp/hddtemp-0.3-beta15-reg-eip.patch?revision=1.1&content-type=text%2Fplain&view=co
+
+__USE_GNU needs to be in effect when including sys/ucontext.h,
+and signal.h pulls it in in some setups.
+
+diff -up hddtemp-0.3-beta15/src/backtrace.c~ hddtemp-0.3-beta15/src/backtrace.c
+--- hddtemp-0.3-beta15/src/backtrace.c~        2006-04-19 05:38:14.000000000 +0300
++++ hddtemp-0.3-beta15/src/backtrace.c 2010-02-14 21:59:47.000000000 +0200
+@@ -27,13 +27,12 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <linux/ptrace.h>
++#define __USE_GNU
++#include <ucontext.h>
+ #include <signal.h>
+ #include <bits/sigcontext.h>
+ #include <sys/param.h>
+ 
+-#define __USE_GNU
+-#include <ucontext.h>
+-
+ #define MAX_BTSIZE 64
+ 
+ void backtrace_handler(int n, siginfo_t *ist, void *extra) {

diff --git a/e2retrieve.spec b/e2retrieve.spec
index a36f6eb09681cf24e6304e75c3485696c781e610..d4c4f788d5ae0f60949b28443a367e07d26fecf3 100644 (file)
--- a/e2retrieve.spec
+++ b/e2retrieve.spec
@@ -8,6 +8,7 @@ Group:          Applications/System
 Source0:       http://www.guzu.net/files/%{name}_%{version}.tar.gz
 # Source0-md5: aa1ab6ff535980fc936fe6c3252e0be9
 Patch0:                %{name}-lvmblkmajor.patch
+Patch1:                %{name}-reg_eip.patch
 URL:           http://www.guzu.net/linux/e2retrieve.php
 BuildRequires: e2fsprogs-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,6 +54,7 @@ e2retrieve:
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \