From d94d7f3cccb341c2c1a55bcbc13a2fcaad2c9c68 Mon Sep 17 00:00:00 2001
From: Dave Young <dyoung@redhat.com>
Date: Thu, 19 Nov 2015 11:06:31 +0800
Subject: [PATCH] Release 2.0.11-2

Rebase makedumpfile 1.5.9

Signed-off-by: Dave Young <dyoung@redhat.com>
---
 .gitignore       |  1 +
 kexec-tools.spec | 23 +++++++++++++----------
 sources          |  5 +----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0c85db7..68d0c52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /kdump-anaconda-addon-005-12-g60fa4c1.tar.gz
 /kdump-anaconda-addon-005-14-g563e904.tar.gz
 /kexec-tools-2.0.11.tar.xz
+/makedumpfile-1.5.9.tar.gz
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 8f58c19..5c6af02 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component
@@ -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.8/makedumpfile-1.5.8.tar.gz
+Source9: http://downloads.sourceforge.net/project/makedumpfile/makedumpfile/1.5.9/makedumpfile-1.5.9.tar.gz
 Source10: kexec-kdump-howto.txt
 Source12: mkdumprd.8
 Source14: 98-kexec.rules
@@ -131,8 +131,8 @@ cp %{SOURCE21} .
 make
 %ifarch %{ix86} x86_64 ppc64 s390x ppc64le
 make -C eppic/libeppic
-make -C makedumpfile-1.5.8 LINKTYPE=dynamic USELZO=on USESNAPPY=on
-make -C makedumpfile-1.5.8 LDFLAGS="-I../eppic/libeppic -L../eppic/libeppic" eppic_makedumpfile.so
+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
 %endif
 make -C kdump-anaconda-addon/po
 
@@ -175,13 +175,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.8/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile
-install -m 644 makedumpfile-1.5.8/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/makedumpfile.8.gz
-install -m 644 makedumpfile-1.5.8/makedumpfile.conf.5.gz $RPM_BUILD_ROOT/%{_mandir}/man5/makedumpfile.conf.5.gz
-install -m 644 makedumpfile-1.5.8/makedumpfile.conf $RPM_BUILD_ROOT/%{_sysconfdir}/makedumpfile.conf.sample
-install -m 755 makedumpfile-1.5.8/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so
+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
 mkdir -p $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/
-install -m 644 makedumpfile-1.5.8/eppic_scripts/* $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/
 %endif
 make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT
 %find_lang kdump-anaconda-addon
@@ -310,6 +310,9 @@ done
 %doc
 
 %changelog
+* Thu Nov 11 2015 Dave Young <dyoung@redhat.com> - 2.0.11-2
+- Rebase to upstream makedumpfile 1.5.9 
+
 * Mon Nov 9 2015 Dave Young <dyoung@redhat.com> - 2.0.11-1
 - Rebase to upstream kexec-tools 2.0.11
 
diff --git a/sources b/sources
index 1f88b0f..e4b2765 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,4 @@
-31668a6dfb8823dd0b7ac09d06fb902e  makedumpfile-1.5.7.tar.gz
-6681319934e22e74c532bd392ccb1bbb  kexec-tools-2.0.9.tar.xz
-642d975349dff744c6027d4486499258  makedumpfile-1.5.8.tar.gz
 43e84f9d3e5b7ba939cc05035a6fb78a  eppic_050615.tar.gz
-70c7e63af2274e040812b243c26ccac8  kexec-tools-2.0.10.tar.xz
 997e64e50a1566361382003a2ca7b61e  kdump-anaconda-addon-005-14-g563e904.tar.gz
 062f74b1a530a5d1b2dcaef985f1a9ff  kexec-tools-2.0.11.tar.xz
+e44244db888acdb0e75962bb59feace2  makedumpfile-1.5.9.tar.gz