Author: arekm Date: Wed Apr 28 13:50:44 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 4; allow gcc 4.5
---- Files affected:
packages/VirtualBox:
VirtualBox.spec (1.272 -> 1.273) , VirtualBox-gcc.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.272
packages/VirtualBox/VirtualBox.spec:1.273
--- packages/VirtualBox/VirtualBox.spec:1.272 Wed Apr 28 15:29:54 2010
+++ packages/VirtualBox/VirtualBox.spec Wed Apr 28 15:50:38 2010
@@ -28,7 +28,7 @@
%define _enable_debug_packages 0
%endif
-%define rel 3
+%define rel 4
%define pname VirtualBox
Summary: VirtualBox OSE - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox OSE - wirtualizator sprzętu x86
@@ -54,6 +54,7 @@
Patch1: %{pname}-configure-spaces.patch
Patch2: %{pname}-export_modules.patch
Patch3: %{pname}-VBoxSysInfo.patch
+Patch4: %{name}-gcc.patch
URL: http://www.virtualbox.org/
BuildRequires: rpmbuild(macros) >= 1.531
%if %{with userspace}
@@ -353,6 +354,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%{__sed} -i -e 's,$VBOX_DOC_PATH,%{_docdir}/%{name}-%{version},'
src/VBox/Installer/linux/virtualbox.desktop
%{__sed} -i -e 's/Categories=.*/Categories=Utility;Emulator;/'
src/VBox/Installer/linux/virtualbox.desktop
@@ -757,6 +759,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.273 2010/04/28 13:50:38 arekm
+- rel 4; allow gcc 4.5
+
Revision 1.272 2010/04/28 13:29:54 arekm
- release 3
================================================================
Index: packages/VirtualBox/VirtualBox-gcc.patch
diff -u /dev/null packages/VirtualBox/VirtualBox-gcc.patch:1.4
--- /dev/null Wed Apr 28 15:50:44 2010
+++ packages/VirtualBox/VirtualBox-gcc.patch Wed Apr 28 15:50:38 2010
@@ -0,0 +1,14 @@
+--- VirtualBox-3.1.6_OSE/configure~ 2010-04-28 15:48:34.341923836 +0200
++++ VirtualBox-3.1.6_OSE/configure 2010-04-28 15:49:21.158168248 +0200
+@@ -394,9 +394,9 @@
+ elif [ $cc_maj -lt 3 \
+ -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
+ -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
+- -o \( $cc_maj -eq 4 -a $cc_min -gt 4 \) \
++ -o \( $cc_maj -eq 4 -a $cc_min -gt 5 \) \
+ -o $cc_maj -gt 4 ]; then
+- log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or
gcc 4.x with 0<x<4"
++ log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or
gcc 4.x with 0<x<5"
+ fail really
+ else
+ log_success "found version $cc_ver"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.272&r2=1.273&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox-gcc.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
