SPECS: etherboot.spec - merge with AC-branch; AC-branch moved

[glen]

Author: glen                         Date: Sun Oct 15 12:10:27 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge with AC-branch; AC-branch moved

---- Files affected:
SPECS:
   etherboot.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/etherboot.spec
diff -u SPECS/etherboot.spec:1.35 SPECS/etherboot.spec:1.36
--- SPECS/etherboot.spec:1.35	Sun Oct 15 14:05:40 2006
+++ SPECS/etherboot.spec	Sun Oct 15 14:10:21 2006
@@ -3,21 +3,25 @@
 Summary:	Software package for booting x86 PCs over a network
 Summary(pl):	Oprogramowanie do startowania komputerów PC poprzez sieć
 Name:		etherboot
-Version:	5.4.1
-Release:	0.1
+Version:	5.4.2
+Release:	1
 License:	GPL
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/etherboot/%{name}-%{version}.tar.bz2
-# Source0-md5:	9d8666f32ca259a045130487e382f88b
+# Source0-md5:	ce257fbb3811448895aa2891940df8ac
 Source1:	http://dl.sourceforge.net/etherboot/%{name}-doc-%{_doc_version}.tar.bz2
 # Source1-md5:	1531d654a9534361c5339d931d5f92f4
 URL:		http://etherboot.sourceforge.net/
+BuildRequires:	cdrtools-mkisofs
 BuildRequires:	mtools
 BuildRequires:	perl-base
 BuildRequires:	syslinux
+BuildRequires:	syslinux
 ExclusiveArch:	%{ix86}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define         _noautostrip    .*
+
 %description
 Etherboot is a free software package for booting x86 PCs over a
 network. In principle this could be any network technology that TCP/IP
@@ -49,15 +53,24 @@
 %build
 # we don't use custom optimalizations here because it can cause problems
 %{__make} -j1 \
-	allzroms alllisos -C src \
-	CC="%{__cc}"
+	allcoms allelfs allisos alllisos allroms	\
+	allzdsks allzhds allzlilos allzpxes allzroms	\
+	-C src CC="%{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/%{name}/{zrom,liso},%{_bindir}}
+install -d $RPM_BUILD_ROOT{%{_libdir}/%{name}/{com,elf,iso,liso,rom,zdsk,zhd,zlilo,zpxe,zrom},%{_bindir}}
 
-install src/bin/*.zrom $RPM_BUILD_ROOT%{_libdir}/%{name}/zrom
+install src/bin/*.com $RPM_BUILD_ROOT%{_libdir}/%{name}/com
+install src/bin/*.elf $RPM_BUILD_ROOT%{_libdir}/%{name}/elf
+install src/bin/*.iso $RPM_BUILD_ROOT%{_libdir}/%{name}/iso
 install src/bin/*.liso $RPM_BUILD_ROOT%{_libdir}/%{name}/liso
+install src/bin/*.rom $RPM_BUILD_ROOT%{_libdir}/%{name}/rom
+install src/bin/*.zdsk $RPM_BUILD_ROOT%{_libdir}/%{name}/zdsk
+install src/bin/*.zhd $RPM_BUILD_ROOT%{_libdir}/%{name}/zhd
+install src/bin/*.zlilo $RPM_BUILD_ROOT%{_libdir}/%{name}/zlilo
+install src/bin/*.zpxe $RPM_BUILD_ROOT%{_libdir}/%{name}/zpxe
+install src/bin/*.zrom $RPM_BUILD_ROOT%{_libdir}/%{name}/zrom
 install src/util/makerom.pl $RPM_BUILD_ROOT%{_bindir}/makerom.pl
 
 %clean
@@ -75,6 +88,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2006/10/15 12:10:21  glen
+- merge with AC-branch; AC-branch moved
+
 Revision 1.35  2006/10/15 12:05:40  glen
 - add missing BR
 - make -j1 due file access problems
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/etherboot.spec?r1=1.35&r2=1.36&f=u