rpms/elilo/devel elilo-3.6-makefile.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 elilo.spec, 1.16, 1.17 sources, 1.9, 1.10

[fedora-cvs-commits at redhat.com]

Author: pnasrat

Update of /cvs/dist/rpms/elilo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21119

Modified Files:
	.cvsignore elilo.spec sources 
Added Files:
	elilo-3.6-makefile.patch 
Log Message:
Update to 3.6

elilo-3.6-makefile.patch:
 Make.defaults |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE elilo-3.6-makefile.patch ---
--- ./Make.defaults.orig	2006-01-25 18:15:27.000000000 -0500
+++ ./Make.defaults	2006-01-25 18:17:54.000000000 -0500
@@ -56,7 +56,7 @@
 EFIINC	   = /usr/include/efi
 GNUEFILIB   = /usr/lib
 EFILIB	   = /usr/lib
-EFICRT0	   = /usr/lib
+EFICRT0	   = /usr/lib/gnuefi
 
 CDIR    := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
 TOPDIR  =
@@ -67,7 +67,7 @@
 
 OPTIMFLAGS = -O2 
 DEBUGFLAGS = -Wall
-CFLAGS	   = $(OPTIMFLAGS) -fpic -fshort-wchar $(DEBUGFLAGS)
+CFLAGS	   = $(OPTIMFLAGS) -fpic -fshort-wchar $(DEBUGFLAGS) -fno-merge-constants
 LDFLAGS	   = -nostdlib -znocombreloc
 INSTALL	   = install
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/elilo/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Sep 2005 19:17:55 -0000	1.8
+++ .cvsignore	27 Jan 2006 16:27:36 -0000	1.9
@@ -1,3 +1,5 @@
 efibootmgr-0.5.0-test4.tar.gz
 elilo-3.4.tar.gz
 efibootmgr-0.5.2.tar.gz
+elilo-3.6.src.tgz
+efibootmgr-0.5.3.tar.gz


Index: elilo.spec
===================================================================
RCS file: /cvs/dist/rpms/elilo/devel/elilo.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- elilo.spec	9 Dec 2005 22:40:18 -0000	1.16
+++ elilo.spec	27 Jan 2006 16:27:36 -0000	1.17
@@ -1,20 +1,16 @@
-%define efibootmgr_ver 0.5.2
+%define efibootmgr_ver 0.5.3
 
 Name: elilo
 Summary: ELILO linux boot loader for EFI-based systems
 Group: System Environment/Base
 Obsoletes: eli
-Version: 3.4
-Release: 12.1
+Version: 3.6
+Release: 1
 License: GPL
-Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/elilo-%{version}.tar.gz
+Source: elilo-%{version}.src.tgz
 Source1: http://domsch.com/linux/ia64/efibootmgr/efibootmgr-%{efibootmgr_ver}.tar.gz
 Source2: fpswa.efi
-Patch1: elilo-3.3a-makefile.patch
-Patch2: elilo-3.4-debug.patch
-Patch3: elilo-initrd-size-fix.patch
-Patch4: elilo-argv-fix.patch
-Patch5: elilo-kill-warnings.patch
+Patch1: elilo-3.6-makefile.patch
 BuildPrereq: gnu-efi, pciutils-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 ExclusiveArch: ia64
@@ -24,15 +20,12 @@
 
 
 %prep
-%setup -q -a 1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p2
-%patch4 -p1
-%patch5 -p1
+%setup -q -a 1 -n elilo
+%patch1 -p0
 
 %build
-make 
+make
+
 cd efibootmgr-%{efibootmgr_ver}
 make
 cp COPYING INSTALL README doc
@@ -45,6 +38,7 @@
 mkdir -p $RPM_BUILD_ROOT/boot/efi/EFI/{redhat,Intel\ Firmware}
 install -m 755 elilo.efi $RPM_BUILD_ROOT/boot/efi/EFI/redhat/elilo.efi
 install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/boot/efi/EFI/Intel\ Firmware/fpswa.efi
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/man8
 install -m 644 efibootmgr-%{efibootmgr_ver}/src/man/man8/efibootmgr.8 $RPM_BUILD_ROOT/usr/share/man/man8
 
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
@@ -61,6 +55,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jan 25 2006 Paul Nasrat <pnasrat at redhat.com>
+- Update elilo and efibootmgr
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/elilo/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Sep 2005 19:17:55 -0000	1.9
+++ sources	27 Jan 2006 16:27:36 -0000	1.10
@@ -1,2 +1,2 @@
-52b2ea392e86df747c46b9200319e3f9  elilo-3.4.tar.gz
-ccdfcc810610a03cf1a02f08028fa22b  efibootmgr-0.5.2.tar.gz
+5fa5d3d1ac2f29e3b56a4e82b752ecd6  elilo-3.6.src.tgz
+7021146c6634459ebd2fec84375754c6  efibootmgr-0.5.3.tar.gz