rpms/VirtualBox/devel VirtualBox-4.3.26-gcc.patch, NONE, 1.1 VirtualBox.spec, 1.71, 1.72 VirtualBox-4.3.10-gcc.patch, 1.1, NONE
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14497
Modified Files:
VirtualBox.spec
Added Files:
VirtualBox-4.3.26-gcc.patch
Removed Files:
VirtualBox-4.3.10-gcc.patch
Log Message:
* Mon May 04 2015 Sérgio Basto <sergio(a)serjux.com> - 4.3.26-2
- Rebuilt for F22 new xorg ABI
- Allow build with gcc 5.1
VirtualBox-4.3.26-gcc.patch:
configure | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- NEW FILE VirtualBox-4.3.26-gcc.patch ---
Index: trunk/configure
===================================================================
--- a/trunk/configure
+++ b/trunk/configure
@@ -423,6 +423,7 @@
-o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" !=
"darwin" \) \
-o \( $cc_maj -eq 4 -a $cc_min -gt 9 \) \
- -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<10"
+ -o \( $cc_maj -eq 5 -a $cc_min -gt 1 \) \
+ -o $cc_maj -gt 5 ]; then
+ log_failure "gcc version $cc_maj.$cc_min found, expected gcc 3.x with x>1
or gcc 4.x with 0<x<10 or gcc 5.1"
fail really
else
log_success "found version $cc_ver"
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- VirtualBox.spec 24 Mar 2015 10:07:10 -0000 1.71
+++ VirtualBox.spec 4 May 2015 16:16:25 -0000 1.72
@@ -27,7 +27,7 @@
Name: VirtualBox
Version: 4.3.26
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -52,7 +52,7 @@
Patch23: VirtualBox-4.3.10-xserver_guest.patch
Patch24: VirtualBox-4.3.0-VBoxGuestLib.patch
Patch26: VirtualBox-4.3.0-no-bundles.patch
-#Patch27: VirtualBox-4.3.10-gcc.patch
+Patch27: VirtualBox-4.3.26-gcc.patch
BuildRequires: kBuild >= 0.1.9998
BuildRequires: SDL-devel xalan-c-devel
@@ -233,7 +233,7 @@
%patch23 -p1 -b .xserver_guest
%patch24 -p1 -b .guestlib
%patch26 -p1 -b .nobundles
-#patch27 -p1 -b .gcc
+%patch27 -p2 -b .gcc
# CRLF->LF
sed -i 's/\r//' COPYING
@@ -619,6 +619,10 @@
%changelog
+* Mon May 04 2015 Sérgio Basto <sergio(a)serjux.com> - 4.3.26-2
+- Rebuilt for F22 new xorg ABI
+- Allow build with gcc 5.1
+
* Tue Mar 24 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 4.3.26-1
- New upstream release .
--- VirtualBox-4.3.10-gcc.patch DELETED ---