rpms/kexec-tools/devel kexec-tools-1.102pre-makedumpfile-makefile.patch, NONE, 1.1 kexec-tools.spec, 1.104, 1.105
Neil Horman (nhorman)
fedora-extras-commits at redhat.com
Thu Jan 3 17:08:18 UTC 2008
Author: nhorman
Update of /cvs/extras/rpms/kexec-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30703
Modified Files:
kexec-tools.spec
Added Files:
kexec-tools-1.102pre-makedumpfile-makefile.patch
Log Message:
Fixing makedumpfile build
kexec-tools-1.102pre-makedumpfile-makefile.patch:
--- NEW FILE kexec-tools-1.102pre-makedumpfile-makefile.patch ---
diff -up kexec-tools-testing-20070330/makedumpfile/Makefile.orig kexec-tools-testing-20070330/makedumpfile/Makefile
--- kexec-tools-testing-20070330/makedumpfile/Makefile.orig 2008-01-03 08:56:42.000000000 -0500
+++ kexec-tools-testing-20070330/makedumpfile/Makefile 2008-01-03 08:57:36.000000000 -0500
@@ -4,9 +4,9 @@ VERSION=1.1.5
DATE=27 July 2007
CC = gcc
-CFLAGS = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \
+CFLAGS = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE \
-DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(DATE)"'
-CFLAGS_ARCH = -g -O2 -Wall -D_FILE_OFFSET_BITS=64
+CFLAGS_ARCH = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
ARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \
-e s/arm.*/arm/ -e s/sa110/arm/ \
Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- kexec-tools.spec 2 Jan 2008 15:39:15 -0000 1.104
+++ kexec-tools.spec 3 Jan 2008 17:07:35 -0000 1.105
@@ -21,8 +21,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(pre): coreutils chkconfig sed
Requires: busybox >= 1.2.0
-BuildRequires: zlib-devel elfutils-libelf-devel glib2-devel pkgconfig
-BuildRequires: elfutils-libelf-devel elfutils-devel-static gettext
+BuildRequires: zlib-devel elfutils-devel-static glib2-devel
+BuildRequires: pkgconfig intltool gettext
%ifarch %{ix86} x86_64 ppc64 ia64 ppc
Obsoletes: diskdumputils netdump
%endif
@@ -64,6 +64,7 @@
Patch602: kexec-tools-1.102pre-x86-add_buffer_retry.patch
Patch603: kexec-tools-1.102pre-makedumpfile-xen-syms.patch
Patch604: kexec-tools-1.102pre-disable-kexec-test.patch
+Patch605: kexec-tools-1.102pre-makedumpfile-makefile.patch
%description
kexec-tools provides /sbin/kexec binary that facilitates a new
@@ -90,6 +91,7 @@
%patch602 -p1
%patch603 -p1
%patch604 -p1
+%patch605 -p1
tar -z -x -v -f %{SOURCE13}
@@ -220,6 +222,8 @@
%changelog
* Wed Jan 02 2008 Neil Horman <nhorman at redhat.com> - 1.102pre-3
- Fix ARCH placement in kdump init script (bz 427201)
+- Fix BuildRequires
+- Fix Makedumpfile to build with new libelf
* Mon Oct 01 2007 Neil Horman <nhorman at redhat.com> - 1.102pre-2
- Fix triggerpostun script (bz 308151)
More information about the fedora-extras-commits
mailing list