- bochs rpm spec: use %{_libdir} instead of /usr/lib for 32/64 bit compatiblity

- developer doc: always refer to release 2.5
- updated version number after pre-release

bochs/build/redhat/bochs.rpmspec.template

@@ -44,12 +44,12 @@ including Linux, DOS, Windows 9X/NT/2000/XP or Windows 7.
 	# Build list of plugins on the fly (if any).  This allows the
 	# spec file to support RPM building with or without plugins.
 	cd $RPM_BUILD_ROOT
-	find ./usr/lib -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > \
+	find .%{_libdir} -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > \
 	  $RPM_BUILD_DIR/file.list.%{pkg_name}
-	find ./usr/lib -type f | sed -e 's,^\.,\%attr(-\,root\,root) ,' \
+	find .%{_libdir} -type f | sed -e 's,^\.,\%attr(-\,root\,root) ,' \
 	  -e '/\/etc\//s|^|%config|' >> \
 	  $RPM_BUILD_DIR/file.list.%{pkg_name}
-	find ./usr/lib -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> \
+	find .%{_libdir} -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> \
 	  $RPM_BUILD_DIR/file.list.%{pkg_name}
 	# We could use the same technique to produce the complete file list,
 	# with only one very minor problem: it lists directories that are

bochs/configure.in

@@ -8,13 +8,13 @@ AC_CONFIG_HEADER(ltdlconf.h)
 
 dnl // Put Bochs version information right here so that it gets substituted
 dnl // into all the right places.
-VERSION="2.6.pre1"
-VER_STRING="2.6.pre1"
+VERSION="2.6.pre1.svn"
+VER_STRING="2.6.pre1.svn"
 dnl // WIN_VER_STRING format is "a, b, c, d"
 dnl // c should be > 90 for pre-release of next version otherwise patch level
 dnl // d should be 0 for release and 1 for svn version
-WIN_VER_STRING="2, 5, 91, 0"
-REL_STRING="Built from SVN snapshot, on August 20, 2012"
+WIN_VER_STRING="2, 5, 91, 1"
+REL_STRING="Built from SVN snapshot, after release 2.6.pre1"
 
 changequote(<<, >>)
 changequote([, ])

bochs/doc/docbook/development/development.dbk

@@ -2211,8 +2211,8 @@ Check date, update/sumup info in CHANGES. Run autoconf to regenerate configure a
 Create an SVN tag that contains all files of the revision that was used in the release.
 For prereleases I create a normal SVN tag like this:
 <screen>
-  svn mkdir tags/REL_2_5_pre1
-  svn copy trunk/bochs tags/REL_2_5_pre1/bochs
+  svn mkdir tags/REL_2_5_pre1_FINAL
+  svn copy trunk/bochs tags/REL_2_5_pre1_FINAL/bochs
   svn commit
 </screen>
 But for a real release, I make an SVN branch tag AND a normal tag.
@@ -2283,10 +2283,10 @@ cd doc/docbook; touch */*.html
 </screen>
 Do make install_win32 into /tmp or someplace:
 <screen>
-make install_win32 prefix=/tmp/bochs-2.4
+make install_win32 prefix=/tmp/bochs-2.5
 </screen>
-This copies all the files into /tmp/bochs-2.4 and then creates a
-binary ZIP at /tmp/bochs-2.4.zip. Rename that bochs-2.4.win32-bin.zip.
+This copies all the files into /tmp/bochs-2.5 and then creates a
+binary ZIP at /tmp/bochs-2.5.zip. Rename that bochs-2.5.win32-bin.zip.
 </para>
 <para>
 Now make the NSIS installer package (the current script is known to work with NSIS 2.44)
@@ -2296,10 +2296,10 @@ cd build/win32/nsis
 Unzip the binary ZIP file into bochs-$VERSION (must match Makefile) and
 then run make.
 <screen>
-unzip ~/bochs-2.4.zip
+unzip ~/bochs-2.5.zip
 make
 </screen>
-That gives an installer called <filename>Bochs-2.4.exe</filename>. Test and upload it.
+That gives an installer called <filename>Bochs-2.5.exe</filename>. Test and upload it.
 </para>
 </section>
 <section><title>Building the release on Linux</title>
@@ -2309,9 +2309,9 @@ directory name with the version number as the destination. Then create the
 source package from this new directory.
 <screen>
   svn co https://bochs.svn.sourceforge.net/svnroot/bochs/tags/REL_2_4_FINAL/bochs bochs-2.4
-  tar czvf bochs-2.4.tar.gz --exclude=.svn bochs-2.4
+  tar czvf bochs-2.5.tar.gz --exclude=.svn bochs-2.5
 </screen>
-The source TAR file bochs-2.4.tar.gz is ready to upload.
+The source TAR file bochs-2.5.tar.gz is ready to upload.
 </para>
 <para>
 The RPM will be building using the configuration in .conf.linux with