From 7b539a0f47bf4ad6083bbfd4057ed446bd409831 Mon Sep 17 00:00:00 2001
From: Baoquan He <bhe@redhat.com>
Date: Fri, 12 Jul 2013 10:07:47 +0800
Subject: [PATCH] pull makedumpfile-1.5.4

---
 .gitignore                                             |  1 +
 ...-2.0.3-build-makedumpfile-eppic-shared-object.patch |  4 ++--
 kexec-tools.spec                                       | 10 +++++-----
 sources                                                |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index ea5a250..65fb0b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ makedumpfile-1.3.5.tar.gz
 /makedumpfile-1.5.3.tar.gz
 /eppic_030413.tar.gz
 /kexec-tools-2.0.4.tar.bz2
+/makedumpfile-1.5.4.tar.gz
diff --git a/kexec-tools-2.0.3-build-makedumpfile-eppic-shared-object.patch b/kexec-tools-2.0.3-build-makedumpfile-eppic-shared-object.patch
index 7460158..15b953e 100644
--- a/kexec-tools-2.0.3-build-makedumpfile-eppic-shared-object.patch
+++ b/kexec-tools-2.0.3-build-makedumpfile-eppic-shared-object.patch
@@ -1,5 +1,5 @@
---- kexec-tools-2.0.3/makedumpfile-1.5.3/Makefile.orig
-+++ kexec-tools-2.0.3/makedumpfile-1.5.3/Makefile
+--- kexec-tools-2.0.3/makedumpfile-1.5.4/Makefile.orig
++++ kexec-tools-2.0.3/makedumpfile-1.5.4/Makefile
 @@ -60,7 +60,7 @@ LIBS := -lsnappy $(LIBS)
  CFLAGS += -DUSESNAPPY
  endif
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 17066c5..16a5f62 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -13,7 +13,7 @@ Source5: kdump.sysconfig.ppc64
 Source6: kdump.sysconfig.ia64
 Source7: mkdumprd
 Source8: kdump.conf
-Source9: http://downloads.sourceforge.net/project/makedumpfile/makedumpfile/1.5.3/makedumpfile-1.5.3.tar.gz
+Source9: http://downloads.sourceforge.net/project/makedumpfile/makedumpfile/1.5.4/makedumpfile-1.5.4.tar.gz
 Source10: kexec-kdump-howto.txt
 Source11: firstboot_kdump.py
 Source12: mkdumprd.8
@@ -136,7 +136,7 @@ cp %{SOURCE10} .
 make
 %ifarch %{ix86} x86_64 ia64 ppc64 s390x
 make -C eppic/libeppic
-make -C makedumpfile-1.5.3 LINKTYPE=dynamic
+make -C makedumpfile-1.5.4 LINKTYPE=dynamic
 %endif
 make -C kexec-tools-po
 
@@ -175,9 +175,9 @@ mkdir -p $RPM_BUILD_ROOT/usr/sbin
 install -m 755 %{SOURCE17} $RPM_BUILD_ROOT/usr/sbin/rhcrashkernel-param
 
 %ifarch %{ix86} x86_64 ia64 ppc64 s390x
-install -m 755 makedumpfile-1.5.3/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile
-install -m 644 makedumpfile-1.5.3/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/makedumpfile.8.gz
-install -m 755 makedumpfile-1.5.3/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so
+install -m 755 makedumpfile-1.5.4/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile
+install -m 644 makedumpfile-1.5.4/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/makedumpfile.8.gz
+install -m 755 makedumpfile-1.5.4/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so
 %endif
 make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
diff --git a/sources b/sources
index 1463f03..8fe6ab5 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 344933eab912fedc27c6bd4587b206ed  kexec-tools-po.tar.gz
-3af415c63f828b18d3f61a35c2a17b96  makedumpfile-1.5.3.tar.gz
 b48eb2726d602c1aa3abfd3739441f54  eppic_030413.tar.gz
 05992bc8c0673fc55be7b6d27e48a8db  kexec-tools-2.0.4.tar.bz2
+150a0952212efd10fa041e4b0582115f  makedumpfile-1.5.4.tar.gz