SPECS: VirtualBox.spec - rel 12; qt4 is not needed; use compat-gcc-34 for b...

[arekm]

Author: arekm                        Date: Mon Aug  4 22:04:57 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 12; qt4 is not needed; use compat-gcc-34 for building userspace and current gcc for kernel modules

---- Files affected:
SPECS:
   VirtualBox.spec (1.105 -> 1.106) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.105 SPECS/VirtualBox.spec:1.106
--- SPECS/VirtualBox.spec:1.105	Mon Aug  4 22:23:17 2008
+++ SPECS/VirtualBox.spec	Tue Aug  5 00:04:51 2008
@@ -11,8 +11,9 @@
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel module
 %bcond_without	userspace	# don't build userspace package
+%bcond_with	verbose
 
-%define		rel		11
+%define		rel		12
 
 %if %{without kernel}
 %undefine	with_dist_kernel
@@ -22,6 +23,9 @@
 %undefine	with_userspace
 %endif
 
+%define		__ucc	gcc-3.4
+%define		__ucxx	g++-3.4
+
 %define		pname	VirtualBox
 
 Summary:	VirtualBox OSE - x86 hardware virtualizer
@@ -54,14 +58,15 @@
 BuildRequires:	bcc
 BuildRequires:	bin86
 BuildRequires:	gcc >= 5:3.2.3
-BuildRequires:	gcc < 5:4.3
+BuildRequires:	compat-gcc-34
+BuildRequires:	compat-gcc-34-c++
+BuildRequires:	compat-gcc-34-libstdc++-devel
 BuildRequires:	iasl
 %endif
 %if %{with dist_kernel}
 BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20
 %endif
 %if %{with userspace}
-BuildRequires:	Qt3Support-devel
 BuildRequires:	libIDL-devel
 BuildRequires:	libpng >= 1.2.5
 BuildRequires:	libstdc++-devel >= 5:3.2.3
@@ -73,7 +78,6 @@
 BuildRequires:	pulseaudio-devel >= 0.9.0
 BuildRequires:	qt-devel >= 6:3.3.6
 BuildRequires:	qt-linguist
-BuildRequires:	qt4-build >= 4.2.0
 %endif
 BuildRequires:	rpmbuild(macros) >= 1.379
 %if %{with userspace}
@@ -276,8 +280,9 @@
 %build
 %if %{with userspace}
 ./configure \
-	--with-gcc="%{__cc}" \
-	--with-g++="%{__cxx}" \
+	--with-gcc="%{__ucc}" \
+	--with-g++="%{__ucxx}" \
+	--disable-qt4 \
 	--disable-kmods
 
 . ./env.sh && kmk -j1
@@ -503,6 +508,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.106  2008/08/04 22:04:51  arekm
+- rel 12; qt4 is not needed; use compat-gcc-34 for building userspace and current gcc for kernel modules
+
 Revision 1.105  2008/08/04 20:23:17  hawk
 - release 11
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/VirtualBox.spec?r1=1.105&r2=1.106&f=u