From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sun, 15 Oct 2006 12:10:21 +0000 (+0000)
Subject: - merge with AC-branch; AC-branch moved
X-Git-Tag: auto/ac/etherboot-5_4_2-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fetherboot.git;a=commitdiff_plain;h=8dea84ecf8830f78c2bacf1a3a0700e22e340312

- merge with AC-branch; AC-branch moved

Changed files:
    etherboot.spec -> 1.36
---

diff --git a/etherboot.spec b/etherboot.spec
index a4f0218..aa37ba7 100644
--- a/etherboot.spec
+++ b/etherboot.spec
@@ -2,21 +2,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
@@ -48,15 +52,24 @@ WAN. Etherboot jest u
 %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