From 6a4e1164dc4d8c24e0557ed7295786a0b18d1a7c Mon Sep 17 00:00:00 2001
From: Dave Young <dyoung@redhat.com>
Date: Wed, 6 Jul 2016 10:08:51 +0800
Subject: [PATCH] Rebase makedumpfile 1.6.0

---
 kexec-tools.spec | 18 +++++++++---------
 sources          |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/kexec-tools.spec b/kexec-tools.spec
index c74e489..ff2126e 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -12,7 +12,7 @@ Source4: kdump.sysconfig.i386
 Source5: kdump.sysconfig.ppc64
 Source7: mkdumprd
 Source8: kdump.conf
-Source9: http://downloads.sourceforge.net/project/makedumpfile/makedumpfile/1.5.9/makedumpfile-1.5.9.tar.gz
+Source9: http://downloads.sourceforge.net/project/makedumpfile/makedumpfile/1.6.0/makedumpfile-1.6.0.tar.gz
 Source10: kexec-kdump-howto.txt
 Source12: mkdumprd.8
 Source14: 98-kexec.rules
@@ -137,8 +137,8 @@ cp %{SOURCE21} .
 make
 %ifarch %{ix86} x86_64 ppc64 s390x ppc64le
 make -C eppic/libeppic
-make -C makedumpfile-1.5.9 LINKTYPE=dynamic USELZO=on USESNAPPY=on
-make -C makedumpfile-1.5.9 LDFLAGS="-I../eppic/libeppic -L../eppic/libeppic" eppic_makedumpfile.so
+make -C makedumpfile-1.6.0 LINKTYPE=dynamic USELZO=on USESNAPPY=on
+make -C makedumpfile-1.6.0 LDFLAGS="-I../eppic/libeppic -L../eppic/libeppic" eppic_makedumpfile.so
 %endif
 make -C kdump-anaconda-addon/po
 
@@ -181,13 +181,13 @@ mkdir -p $RPM_BUILD_ROOT/usr/sbin
 install -m 755 %{SOURCE17} $RPM_BUILD_ROOT/usr/sbin/rhcrashkernel-param
 
 %ifarch %{ix86} x86_64 ppc64 s390x ppc64le
-install -m 755 makedumpfile-1.5.9/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile
-install -m 644 makedumpfile-1.5.9/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/makedumpfile.8.gz
-install -m 644 makedumpfile-1.5.9/makedumpfile.conf.5.gz $RPM_BUILD_ROOT/%{_mandir}/man5/makedumpfile.conf.5.gz
-install -m 644 makedumpfile-1.5.9/makedumpfile.conf $RPM_BUILD_ROOT/%{_sysconfdir}/makedumpfile.conf.sample
-install -m 755 makedumpfile-1.5.9/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so
+install -m 755 makedumpfile-1.6.0/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile
+install -m 644 makedumpfile-1.6.0/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/makedumpfile.8.gz
+install -m 644 makedumpfile-1.6.0/makedumpfile.conf.5.gz $RPM_BUILD_ROOT/%{_mandir}/man5/makedumpfile.conf.5.gz
+install -m 644 makedumpfile-1.6.0/makedumpfile.conf $RPM_BUILD_ROOT/%{_sysconfdir}/makedumpfile.conf.sample
+install -m 755 makedumpfile-1.6.0/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so
 mkdir -p $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/
-install -m 644 makedumpfile-1.5.9/eppic_scripts/* $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/
+install -m 644 makedumpfile-1.6.0/eppic_scripts/* $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/
 %endif
 make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT
 %find_lang kdump-anaconda-addon
diff --git a/sources b/sources
index 7893981..3ca09b3 100644
--- a/sources
+++ b/sources
@@ -5,3 +5,4 @@ dbfe610a82965346fd40d2ce15d48851  kdump-anaconda-addon-005-16-g586cc82.tar.gz
 e44244db888acdb0e75962bb59feace2  makedumpfile-1.5.9.tar.gz
 437a0af2435155807c0a37b7fe221248  kexec-tools-2.0.12.tar.xz
 a253a7f00d66c61eee1416e94077226b  kdump-anaconda-addon-005-18-g05ee64c.tar.gz
+041c5c6de2c3066600e4ca646c2397d6  makedumpfile-1.6.0.tar.gz