rpms/bochs/devel bochs.spec,1.36,1.37

[Glauber Costa]

Author: glommer

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

Modified Files:
	bochs.spec 
Log Message:
updated to git 04387139e3b, and applied qemu's patch ontop.




Index: bochs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- bochs.spec	24 Feb 2009 05:21:28 -0000	1.36
+++ bochs.spec	5 Mar 2009 17:28:21 -0000	1.37
@@ -1,26 +1,41 @@
+%define githead 04387139e3b
 Name:           bochs
-Version:        2.3.7
-Release:        3%{?dist}
+Version:        2.3.8
+Release:        0.1.git%{githead}%{?dist}
 Summary:        Portable x86 PC emulator
 Group:          Applications/Emulators
 License:        LGPLv2+
 URL:            http://bochs.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         %{name}-nonet-build.patch
-Patch1:         %{name}-wx28.patch
-Patch2:         bochs-2.3.6-gcc43.patch
-# from upstream CVS
-Patch3:         bochs-2.3.7-3dnow-compile-fix.patch
-# submitted upstream:
-# http://sourceforge.net/tracker/index.php?func=detail&aid=1992322&group_id=12580&atid=312580
-Patch4:         bochs-2.3.7-big-endian.patch
+#Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# git clone git://git.kernel.org/pub/scm/virt/bochs/bochs.git
+# cd bochs
+# git archive --format=tar --prefix=%{name}-%{version}/ %{githead} | gzip > ../%{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.gz
+
+Patch0:	%{name}-0001_bx-qemu.patch
+Patch1:	%{name}-0002_kvm-bios-update-smbios-table-to-report-memory-above-4g.patch
+Patch2:	%{name}-0003_kvm-bios-generate-mptable-unconditionally.patch
+Patch3:	%{name}-0004_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch
+Patch4:	%{name}-0005_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch
+Patch5:	%{name}-0006_qemu-bios-use-preprocessor-for-pci-link-routing.patch
+Patch6:	%{name}-0007_bios-add-26-pci-slots,-bringing-the-total-to-32.patch
+Patch7:	%{name}-0008_qemu-bios-provide-gpe-_l0x-methods.patch
+Patch8:	%{name}-0009_qemu-bios-pci-hotplug-support.patch
+Patch9:	%{name}-0010_bios-mark-the-acpi-sci-interrupt-as-connected-to-irq-9.patch
+Patch10:	%{name}-0011_read-additional-acpi-tables-from-a-vm.patch
+Patch11:	%{name}-nonet-build.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libXt-devel libXpm-devel SDL-devel readline-devel byacc
 BuildRequires:  docbook-utils
+BuildRequires:  gtk2-devel
 #BuildRequires:  wxGTK-devel
 %ifarch %{ix86} x86_64
 BuildRequires:  svgalib-devel
+BuildRequires:	dev86
 %endif
+Requires:	%{name}-bios = %{version}-%{release}
+Requires:	vgabios
 
 %description
 Bochs is a portable x86 PC emulation software package that emulates
@@ -46,14 +61,42 @@
 Special version of bochs compiled with a gdb stub so that the software running
 inside the emulator can be debugged with gdb.
 
+%ifarch %{ix86} x86_64
+# building firmwares are quite tricky, because they often has to be built on
+# their native architecture (or in a cross-capable compiler, that we lack in
+# koji), and deployed everywhere. Recent koji builders support a feature
+# that allow us to build packages in a single architecture, and create noarch
+# subpackages that will be deployed everywhere. Because the package can only
+# be built in certain architectures, the main package has to use
+# BuildArch: <nativearch>, or something like that.
+# Note that using ExclusiveArch is _wrong_, because it will prevent the noarch
+# packages from getting into the excluded repositories.
+%package	bios
+Summary:	Bochs bios
+Group:		Applications/Emulators
+BuildArch:	noarch
+
+
+%description bios
+Bochs BIOS is a free implementation of a x86 BIOS provided by the Bochs projects.
+It can also be used in other emulators, such as QEMU
+%endif
 
 %prep
 %setup -q
-%patch0 -p0 -z .nonet
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p0 -z .nonet
+
 # Fix up some man page paths.
 sed -i \
   -e 's|/usr/local/share/doc/bochs/|%{_docdir}/%{name}-%{version}/|' \
@@ -105,10 +148,18 @@
 %configure $CONFIGURE_FLAGS
 make %{?_smp_mflags}
 
+%ifarch %{ix86} x86_64
+cd bios
+make bios
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT _installed-docs
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT%{_prefix}/share/bochs/VGABIOS*
+%ifnarch %{ix86} x86_64
+rm -rf $RPM_BUILD_ROOT%{_prefix}/share/bochs/*BIOS*
+%endif
 install -m 755 bochs-debugger bochs-gdb $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{_docdir}/bochs _installed-docs
 rm $RPM_BUILD_ROOT%{_mandir}/man1/bochs-dlx.1*
@@ -131,9 +182,15 @@
 %{_mandir}/man1/bximage.1*
 %{_mandir}/man5/bochsrc.5*
 %dir %{_datadir}/bochs/
-%{_datadir}/bochs/*BIOS*
 %{_datadir}/bochs/keymaps/
 
+%ifarch %{ix86} x86_64
+%files bios
+%defattr(-,root,root,-)
+%{_datadir}/bochs/BIOS*
+%endif
+
+
 %files debugger
 %defattr(-,root,root,-)
 %{_bindir}/bochs-debugger
@@ -144,6 +201,9 @@
 
 
 %changelog
+* Thu Mar 05 2009 Glauber Costa <glommer at redhat.com> 2.3.8-0.1.git04387139e3b
+- updated to git 04387139e3b, and applied qemu's patch ontop.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild