rpms/bochs/devel bochs.spec,1.17,1.18 sources,1.6,1.7

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	bochs.spec sources 
Log Message:
* Mon Jul 17 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3-0.1.pre2
- New upstream version 2.3.pre2
- Drop upstreamed wx26 patch



Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bochs.spec	28 Feb 2006 08:21:25 -0000	1.17
+++ bochs.spec	17 Jul 2006 09:40:06 -0000	1.18
@@ -1,21 +1,18 @@
 %bcond_with     debugger
+%define         pre_version pre2
 
 Name:           bochs
-Version:        2.2.6
-Release:        1%{?dist}
+Version:        2.3
+Release:        0.1.%{pre_version}%{?dist}
 Summary:        Portable x86 PC emulator
-
 Group:          Applications/Emulators
 License:        LGPL
 URL:            http://bochs.sourceforge.net/
-Source0:        http://download.sf.net/bochs/%{name}-%{version}.tar.gz
+Source0:        http://download.sf.net/bochs/%{name}-%{version}.%{pre_version}.tar.gz
 Source1:        http://bochs.sourceforge.net/guestos/dlxlinux4.tar.gz
 Patch0:         %{name}-nonet-build.patch
 Patch1:         %{name}-config.patch
-Patch2:         %{name}-wx26.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  autoconf
 BuildRequires:  docbook-utils
 BuildRequires:  libXt-devel
 BuildRequires:  libXpm-devel
@@ -48,17 +45,16 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}.%{pre_version}
 %patch0 -p0 -z .nonet
-%patch2 -p1 -z .wx26
-autoconf
 cp -p %{SOURCE1} .
-
 # Fix up some man page paths.
 sed -i \
   -e 's|/usr/local/share/doc/bochs/|%{_docdir}/%{name}-%{version}/|' \
   -e 's|/usr/local/share/|%{_datadir}/|' \
   doc/man/*.*
+# remove executable bits from sources to make rpmlint happy with the debuginfo
+chmod -x `find -name '*.cc' -o -name '*.h' -o -name '*.inc'`
 
 
 %build
@@ -128,6 +124,10 @@
 
 
 %changelog
+* Mon Jul 17 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3-0.1.pre2
+- New upstream version 2.3.pre2
+- Drop upstreamed wx26 patch
+
 * Wed Feb 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> - 2.2.6-1
 - New upstream version 2.2.6
 - Rebuild for new gcc4.1 and glibc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Feb 2006 21:20:29 -0000	1.6
+++ sources	17 Jul 2006 09:40:06 -0000	1.7
@@ -1,2 +1,2 @@
-961482eb78b55fe3e0e0639e34b4c2c1  bochs-2.2.6.tar.gz
 379269841ae5aef95e4ec56d6d186532  dlxlinux4.tar.gz
+b68eacd9a8ea40f3e678b7daf29a0d2b  bochs-2.3.pre2.tar.gz