rpms/kexec-tools/devel kexec-tools-1.101-add-makedumpfile2.patch, 1.3, 1.4 kexec-tools.spec, 1.44, 1.45

[fedora-cvs-commits at redhat.com]

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16341

Modified Files:
	kexec-tools-1.101-add-makedumpfile2.patch kexec-tools.spec 
Log Message:
once again fixing makedumpfile Makefile

kexec-tools-1.101-add-makedumpfile2.patch:
 Makefile                      |   75 
 dwarfinfo/dwarf_alloc.c       |  170 --
 dwarfinfo/dwarf_alloc.h       |    7 
 dwarfinfo/dwarf_die_deliv.c   |    5 
 dwarfinfo/dwarf_error.c       |    7 
 dwarfinfo/dwarf_form.c        |   33 
 dwarfinfo/dwarf_incl.h        |   37 
 dwarfinfo/dwarf_init_finish.c |  324 ---
 dwarfinfo/dwarf_leb.c         |    5 
 dwarfinfo/dwarf_line.c        | 1277 ---------------
 dwarfinfo/dwarf_loc.c         |  158 -
 dwarfinfo/dwarf_names.c       | 3461 ++++++------------------------------------
 dwarfinfo/dwarf_query.c       |  331 ----
 dwarfinfo/dwarf_util.c        |    5 
 dwarfinfo/dwarfdump.c         |  567 +-----
 dwarfinfo/esb.c               |   78 
 dwarfinfo/globals.h           |   29 
 dwarfinfo/malloc_check.c      |   42 
 dwarfinfo/print_die.c         |  699 +++-----
 makedumpfile.c                |  502 +++---
 makedumpfile.h                |   30 
 21 files changed, 1427 insertions(+), 6415 deletions(-)

Index: kexec-tools-1.101-add-makedumpfile2.patch
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-add-makedumpfile2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kexec-tools-1.101-add-makedumpfile2.patch	3 Aug 2006 15:16:27 -0000	1.3
+++ kexec-tools-1.101-add-makedumpfile2.patch	3 Aug 2006 15:25:55 -0000	1.4
@@ -4,7 +4,7 @@
  CC	= gcc
 -CFLAGS	= -g -Wall `gtk-config --cflags` `gtk-config --libs` -D_FILE_OFFSET_BITS=64
 +CFLAGS	= -g -O2 -Wall
-+CFLAGS2	= -g -O2 -Wall `pkg-config --cflags glib` -lglib -D_FILE_OFFSET_BITS=64 
++CFLAGS2	= -g -O2 -Wall `pkg-config --cflags glib-2.0` -lglib -D_FILE_OFFSET_BITS=64 
  
  ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
  			       -e s/arm.*/arm/ -e s/sa110/arm/ \


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kexec-tools.spec	3 Aug 2006 15:17:10 -0000	1.44
+++ kexec-tools.spec	3 Aug 2006 15:25:55 -0000	1.45
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 37%{dist}.1
+Release: 38%{dist}.1
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -139,6 +139,9 @@
 %doc TODO
 
 %changelog
+* Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-38%{dist}.1
+- updating makedumpfile makefile to use pkg-config on glib-2.0
+
 * Thu Aug 03 2006 Neil Horman <nhorman at redhat.com> - 1.101-37%{dist}.1
 - updating makedumpfile makefile to use pkg-config