rpms/VirtualBox/devel VirtualBox.spec, 1.24, 1.25 vboxweb.service, 1.1, 1.2

[Sérgio M. Basto]

Author: sergiomb

Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4743

Modified Files:
	VirtualBox.spec vboxweb.service 
Log Message:
* Thu Sep 13 2012 Sérgio Basto <sergio at serjux.com> - 4.2.0-0.7.RC4 
- Another try to compile with 32-bits suport on x86_64.



Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- VirtualBox.spec	9 Sep 2012 01:03:58 -0000	1.24
+++ VirtualBox.spec	13 Sep 2012 21:50:30 -0000	1.25
@@ -15,7 +15,7 @@
 
 Name:       VirtualBox
 Version:    4.2.0
-Release:    0.6%{?prerel:.%{prerel}}%{?dist}
+Release:    0.7%{?prerel:.%{prerel}}%{?dist}
 Summary:    A general-purpose full virtualizer for PC hardware
 
 Group:      Development/Tools
@@ -34,9 +34,6 @@
 Patch2:     VirtualBox-4.1.18-strings.patch
 Patch3:     VirtualBox-4.2.0-libcxx.patch
 Patch5:     VirtualBox-4.2.0-xorg17.patch
-%ifarch x86_64
-Patch10:	VirtualBox-4.2.0-32bit.patch
-%endif
 Patch15:    VirtualBox-OSE-4.0.0-makeself.patch
 Patch17:    VirtualBox-OSE-4.0.0-beramono.patch
 Patch18:    VirtualBox-OSE-4.0.2-aiobug.patch
@@ -64,9 +61,7 @@
 BuildRequires:  java-devel >= 1.6
 BuildRequires:  /usr/bin/pdflatex
 BuildRequires:  libpng-devel
-#BuildRequires:  glibc.i686 glibc-devel.i686 libstdc++.i686
-#BuildRequires:  /usr/lib/libc.so
-#BuildRequires:  /usr/lib/libstdc++.so.6 /lib/libc.so.6 
+BuildRequires:  glibc(x86-32) glibc-devel(x86-32) libstdc++(x86-32)
 
 # For the X11 module
 BuildRequires:  libdrm-devel
@@ -181,17 +176,12 @@
 %patch3 -p1 -b .libcxx
 %patch5 -p1 -b .xorg17
 %patch15 -p1 -b .makeself
-%ifarch x86_64
-%patch10 -p1 -b .32bit
-%endif
 %patch17 -p1 -b .beramono
 %patch18 -p1 -b .aiobug
 %if 0%{?fedora} < 16
 %patch22 -p1 -b .gsoap
 %endif
-%if 0%{?fedora} > 16
 %patch23 -p1 -b .mesa
-%endif
 #if 0%{?fedora} > 17
 #patch24 -p1 -b .x113
 #endif
@@ -201,6 +191,8 @@
 rm -rf kBuild
 %endif
 rm -rf tools
+
+# Remove x11 source code.
 rm -rf src/VBox/Additions/x11/x11include
 
 # CRLF->LF
@@ -557,6 +549,9 @@
 
 
 %changelog
+* Thu Sep 13 2012 Sérgio Basto <sergio at serjux.com> - 4.2.0-0.7.RC4 
+- Another try to compile with 32-bits suport on x86_64.
+
 * Sun Sep 09 2012 Sérgio Basto <sergio at serjux.com> - 4.2.0-0.6.RC4
 - Update to RC4. 
 - Rename 32-bits patch to VirtualBox-4.2.0-32bit.patch


Index: vboxweb.service
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/vboxweb.service,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vboxweb.service	29 Apr 2012 16:11:11 -0000	1.1
+++ vboxweb.service	13 Sep 2012 21:50:30 -0000	1.2
@@ -1,5 +1,5 @@
 [Unit]
-Description=VirtualBox OSE Web Service
+Description=VirtualBox Web Service
 After=network.target
 
 [Service]