rpms/elilo/devel .cvsignore, 1.9, 1.10 elilo.spec, 1.24, 1.25 sources, 1.10, 1.11 elilo-3.6-kern-types.patch, 1.1, NONE elilo-3.6-libz.patch, 1.1, NONE

[Christopher Edward Lumens (clumens)]

Author: clumens

Update of /cvs/pkgs/rpms/elilo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1667

Modified Files:
	.cvsignore elilo.spec sources 
Removed Files:
	elilo-3.6-kern-types.patch elilo-3.6-libz.patch 
Log Message:
Remove efibootmgr (Matt Domsch).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/elilo/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Jan 2006 16:27:36 -0000	1.9
+++ .cvsignore	10 Jan 2008 14:25:35 -0000	1.10
@@ -1,5 +1,2 @@
-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/pkgs/rpms/elilo/devel/elilo.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- elilo.spec	14 Nov 2007 20:05:14 -0000	1.24
+++ elilo.spec	10 Jan 2008 14:25:35 -0000	1.25
@@ -1,26 +1,22 @@
-%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.6
-Release: 5
+Release: 6
 License: GPL
 URL: http://elilo.sourceforge.net
 
 Source: http://downloads.sf.net/%{name}/%{name}-%{version}.src.tgz
-Source1: http://linux.dell.com/efibootmgr/permalink/efibootmgr-%{efibootmgr_ver}.tar.gz
-Source2: fpswa.efi
-Patch1: %{name}-3.6-makefile.patch
-Patch2: %{name}-3.6-kern-types.patch
-Patch3: %{name}-3.6-libz.patch
+Source1: fpswa.efi
+Patch0: %{name}-3.6-makefile.patch
 
-BuildRequires: gnu-efi, pciutils-devel, zlib-devel
+BuildRequires: gnu-efi
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: ia64
 
-Provides: efibootmgr = ${efibootmgr_ver}
+Obsoletes: elilo <= 3.6-5
+Conflicts: elilo <= 3.6-5
 
 %description
 ELILO is a linux boot loader for EFI-based systems, such as IA-64.
@@ -28,45 +24,31 @@
 
 %prep
 %setup -q -a 1 -n elilo
-%patch1 -p0
-pushd efibootmgr-%{efibootmgr_ver}
-%patch2 -p1
-popd
-%patch3 -p0
+%patch0 -p0
 
 %build
 # Can't build with ${?_smp_mflags}
 make
 
-cd efibootmgr-%{efibootmgr_ver}
-make
-cp -a COPYING INSTALL README doc
-mv doc efibootmgr-doc
-cd ..
-
 %install
 rm -rf %{buildroot}
 
 mkdir -p %{buildroot}/boot/efi/EFI/{redhat,Intel\ Firmware}
 install -m 755 elilo.efi %{buildroot}/boot/efi/EFI/redhat/elilo.efi
 install -m 755 %{SOURCE2} %{buildroot}/boot/efi/EFI/Intel\ Firmware/fpswa.efi
-mkdir -p %{buildroot}/%{_mandir}/man8
-install -m 644 efibootmgr-%{efibootmgr_ver}/src/man/man8/efibootmgr.8 %{buildroot}/%{_mandir}/man8
-
-mkdir -p %{buildroot}/%{_sbindir}
-install -m 755 efibootmgr-%{efibootmgr_ver}/src/efibootmgr/efibootmgr %{buildroot}/%{_sbindir}
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc docs/* README.* LIMITATIONS ChangeLog efibootmgr-%{efibootmgr_ver}/efibootmgr-doc
+%doc docs/* README.* LIMITATIONS ChangeLog
 /boot/efi
-%{_sbindir}/efibootmgr
-%{_mandir}/man*/*
 
 %changelog
+* Thu Jan 10 2008 Chris Lumens <clumens at redhat.com> 3.6-6
+- Remove efibootmgr, which is now in its own package (Matt Domsch).
+
 * Tue Nov 12 2007 Matt Domsch <Matt_Domsch at dell.com> 3.6-5
 - provide efibootmgr in preparation for split
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/elilo/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Jan 2006 16:27:36 -0000	1.10
+++ sources	10 Jan 2008 14:25:35 -0000	1.11
@@ -1,2 +1 @@
 5fa5d3d1ac2f29e3b56a4e82b752ecd6  elilo-3.6.src.tgz
-7021146c6634459ebd2fec84375754c6  efibootmgr-0.5.3.tar.gz


--- elilo-3.6-kern-types.patch DELETED ---


--- elilo-3.6-libz.patch DELETED ---