rpms/etherboot/devel etherboot.spec,1.2,1.3

[Eduardo Habkost]

Author: ehabkost

Update of /cvs/pkgs/rpms/etherboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17884

Modified Files:
	etherboot.spec 
Log Message:
New subpackages: -zroms and -zroms-kvm



Index: etherboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- etherboot.spec	1 Dec 2008 13:06:00 -0000	1.2
+++ etherboot.spec	1 Dec 2008 16:05:57 -0000	1.3
@@ -1,4 +1,4 @@
-%define formats  pxe rom
+%define formats  pxe rom zrom
 
 # the arches where we are able to actually build the binaries.
 # on the other arches, we will use the prebuilt binaries
@@ -6,7 +6,7 @@
 
 Name: etherboot
 Version: 5.4.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Etherboot collection of boot roms
 
 Group: Development/Tools
@@ -39,9 +39,18 @@
 Group: Development/Tools
 Requires: %{name}-roms-kvm
 
-
 %package roms-kvm
-Summary: Etherboot - boot roms supported by KVM
+Summary: Etherboot - boot roms supported by KVM, .rom format
+Group: Development/Tools
+
+
+%package zroms
+Summary: Etherboot - boot roms in .zrom format
+Group: Development/Tools
+Requires: %{name}-zroms-kvm
+
+%package zroms-kvm
+Summary: Etherboot - boot roms supported by KVM, .zrom format
 Group: Development/Tools
 
 
@@ -71,7 +80,21 @@
 
 
 %description roms-kvm
-This package contains the etherboot ROMs for devices emulated by KVM.
+This package contains the etherboot ROMs for devices emulated by KVM,
+in .rom format.
+
+
+%description zroms
+Etherboot is an open source (GPL) network bootloader. It provides a direct
+replacement for proprietary PXE ROMs, with many extra features such as
+DNS, HTTP, iSCSI, etc
+
+This package contains the Etherboot roms in .zrom format.
+
+
+%description zroms-kvm
+This package contains the etherboot ROMs for devices emulated by KVM,
+in .zrom format.
 
 
 %prep
@@ -103,7 +126,7 @@
 
 # undi is broken by now
 sed -i -e '/undi/d' Families
-make %{?_smp_mflags} allpxes allroms %{makeflags}
+make %{?_smp_mflags} allpxes allroms allzroms %{makeflags}
 
 %else
 # Simply copy the prebuilt binaries:
@@ -124,11 +147,14 @@
 done
 popd
 
+
 # the roms supported by kvm will be packaged separatedly
 # remove from the main rom list and add them to kvm.list
-for rom in ne e1000-82542 pcnet32 rtl8139 virtio-net;do
-	sed -i -e "/\/${rom}.rom/d" rom.list
-	echo %{_datadir}/%{name}/${rom}.rom >> kvm.list
+for fmt in rom zrom;do 
+	for rom in ne e1000-82542 pcnet32 rtl8139 virtio-net;do
+		sed -i -e "/\/${rom}.rom/d" ${fmt}.list
+		echo %{_datadir}/%{name}/${rom}.${fmt} >> kvm.${fmt}.list
+	done
 done
 
 %clean
@@ -143,12 +169,23 @@
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}
 
-%files roms-kvm -f kvm.list
+%files roms-kvm -f kvm.rom.list
+%defattr(-,root,root,-)
+%dir %{_datadir}/%{name}
+
+%files zroms -f zrom.list
+%defattr(-,root,root,-)
+%dir %{_datadir}/%{name}
+
+%files zroms-kvm -f kvm.zrom.list
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}
 
 
 %changelog
+* Mon Dec 01 2008 Eduardo Habkost <ehabkost at redhat.com> - 5.4.5-6
+- New subpackages: -zroms and -zroms-kvm
+
 * Mon Dec 01 2008 Eduardo Habkost <ehabkost at redhat.com> - 5.4.4-5
 - Make packages own /usr/share/etherboot directory