rpms/bochs/devel bochs.spec,1.10,1.11

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/bochs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv603

Modified Files:
	bochs.spec 
Log Message:
* Fri Dec 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.2.1-2
- Adapt to modular X.
- Fix build with g++ 4.1.0.
- Conditionalize wxGTK build and default it to off (build failures w/2.6.x).
- Use sed instead of dos2unix and perl during build.



Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bochs.spec	10 Jul 2005 16:14:58 -0000	1.10
+++ bochs.spec	16 Dec 2005 08:54:43 -0000	1.11
@@ -1,6 +1,9 @@
+%bcond_with     debugger
+%bcond_with     wx
+
 Name:           bochs
 Version:        2.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Portable x86 PC emulator
 
 Group:          Applications/Emulators
@@ -14,12 +17,16 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  docbook-utils
-BuildRequires:  wxGTK2-devel
+BuildRequires:  libXt-devel
+BuildRequires:  libXpm-devel
 BuildRequires:  ncurses-devel
-BuildRequires:  dos2unix
-BuildRequires:  %{__perl}
 BuildRequires:  SDL-devel
-%{?_with_debugger:BuildRequires: readline-devel}
+%if %{with wx}
+BuildRequires:  wxGTK-devel
+%endif
+%if %{with debugger}
+BuildRequires:  readline-devel
+%endif
 
 %description
 Bochs is a portable x86 PC emulation software package that emulates
@@ -43,17 +50,22 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
+cp -p %{SOURCE1} .
+
 # Uh-oh, great!
-%{__perl} -pi -e \
-  's|wx_needs_gtk2=0|wx_needs_gtk2=1| ;
-   s|/opt/gnome/include/|%{_includedir}/|' \
+sed -i \
+  -e 's|wx_needs_gtk2=0|wx_needs_gtk2=1|' \
+  -e 's|/opt/gnome/include/|%{_includedir}/|' \
   configure*
+
 # Fix up some man page paths.
-%{__perl} -pi -e \
-  's|/usr/local/share/doc/bochs\b|%{_docdir}/%{name}-%{version}| ;
-   s|/usr/local/share/|%{_datadir}/|' \
+sed -i \
+  -e 's|/usr/local/share/doc/bochs/|%{_docdir}/%{name}-%{version}/|' \
+  -e 's|/usr/local/share/|%{_datadir}/|' \
   doc/man/*.*
-cp -p %{SOURCE1} .
+
+# Fix build error with g++ 4.1.0
+sed -i -e '/#ifndef PARANOID/,/#endif/d' iodev/harddrv.h
 
 
 %build
@@ -66,7 +78,7 @@
   --enable-pci \
   --enable-4meg-pages \
   --enable-pae \
-  %{?_with_debugger:--enable-debugger} \
+  %{?with_debugger:--enable-debugger} \
   --enable-all-optimizations \
   --enable-vbe \
   --enable-3dnow \
@@ -78,14 +90,14 @@
   --with-term \
   --with-rfb \
   --with-sdl \
-  --with-wx
+  --with%{!?with_wx:out}-wx
 
 make %{?_smp_mflags}
 make unpack_dlx
 
 # This needs to be done after "make unpack_dlx".
 %{__patch} -p0 < %{PATCH2}
-dos2unix dlxlinux/readme.txt dlxlinux/bochsrc.txt
+sed -i -e 's/\r//' dlxlinux/readme.txt dlxlinux/bochsrc.txt
 
 
 %install
@@ -122,6 +134,12 @@
 
 
 %changelog
+* Fri Dec 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.2.1-2
+- Adapt to modular X.
+- Fix build with g++ 4.1.0.
+- Conditionalize wxGTK build and default it to off (build failures w/2.6.x).
+- Use sed instead of dos2unix and perl during build.
+
 * Sat Jul  9 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.2.1-1
 - 2.2.1, precision patch applied upstream.