rpms/bochs-bios/devel bochs-bios.spec,1.2,1.3
Glauber Costa
glommer at fedoraproject.org
Tue Mar 3 03:12:35 UTC 2009
Author: glommer
Update of /cvs/pkgs/rpms/bochs-bios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17879
Modified Files:
bochs-bios.spec
Log Message:
Use conditionals on ix86 instead of BuildArch. This scheme is uglier, but
works much better while rpm bug #442105 is not fixed yet.
Index: bochs-bios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bochs-bios/devel/bochs-bios.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bochs-bios.spec 3 Mar 2009 02:55:19 -0000 1.2
+++ bochs-bios.spec 3 Mar 2009 03:12:05 -0000 1.3
@@ -7,7 +7,7 @@
Name: bochs-bios
Version: 2.3.8
-Release: 0.5.git%{githead}%{?dist}
+Release: 0.6.git%{githead}%{?dist}
Summary: Bios implementation from the Bochs project
Group: Applications/Emulators
License: LGPLv2+
@@ -28,14 +28,13 @@
Patch9: %{name}-0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libXt-devel libXpm-devel SDL-devel readline-devel byacc dev86 iasl
-BuildArch: %{ix86} x86_64
-
%description
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
+%ifarch %{ix86}
%package data
Summary: real data for the bios
BuildArch: noarch
@@ -43,6 +42,7 @@
%description data
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
@@ -60,27 +60,36 @@
%build
+%ifarch %{ix86}
%configure --prefix=/%{_prefix}
make -C bios %{?_smp_mflags}
+%endif
%install
rm -rf $RPM_BUILD_ROOT
+%ifarch %{ix86}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/bochs
install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/bochs/ bios/BIOS*
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
-
+%ifarch %{ix86}
%files data
%defattr(-,root,root,-)
%dir %{_datadir}/bochs/
%{_datadir}/bochs/BIOS-bochs-latest
%{_datadir}/bochs/BIOS-bochs-legacy
+%endif
%changelog
+* Tue Mar 03 2009 Glauber Costa <glommer at redhat.com> 2.3.8-0.6.git36989b0d2
+- Use conditionals on ix86 instead of BuildArch. This scheme is uglier, but
+ works much better while rpm bug #442105 is not fixed yet.
+
* Tue Mar 03 2009 Glauber Costa <glommer at redhat.com> 2.3.8-0.5.git36989b0d2
- Don't create debug packages, as they'll clash.
More information about the scm-commits
mailing list