Author: sergiomb Update of /cvs/free/rpms/VirtualBox/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25060 Modified Files: VirtualBox.spec Added Files: VirtualBox-4.3.10-gcc.patch Removed Files: VirtualBox-4.2.6-gcc48.patch Log Message: * Fri May 02 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.10-2 - Rebuild for new x11-xorg-server VirtualBox-4.3.10-gcc.patch: configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE VirtualBox-4.3.10-gcc.patch --- --- ./configure.gcc 2014-05-02 19:18:06.929223329 +0100 +++ ./configure 2014-05-02 19:21:11.010309549 +0100 @@ -420,9 +420,9 @@ check_gcc() 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 8 \) \ + -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<8" + log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<10" 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.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- VirtualBox.spec 31 Mar 2014 01:13:25 -0000 1.60 +++ VirtualBox.spec 2 May 2014 18:55:30 -0000 1.61 @@ -27,7 +27,7 @@ Name: VirtualBox Version: 4.3.10 -Release: 1%{?prerel:.%{prerel}}%{?dist} +Release: 2%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -52,6 +52,7 @@ Patch23: VirtualBox-4.3.6-mesa.patch Patch24: VirtualBox-4.3.0-VBoxGuestLib.patch Patch26: VirtualBox-4.3.0-no-bundles.patch +Patch27: VirtualBox-4.3.10-gcc.patch %if 0%{?fedora} < 16 BuildRequires: kBuild >= 0.1.98 @@ -233,6 +234,7 @@ %patch23 -p1 -b .mesa %patch24 -p1 -b .guestlib %patch26 -p1 -b .nobundles +%patch27 -p1 -b .gcc # CRLF->LF sed -i 's/\r//' COPYING @@ -242,8 +244,7 @@ %if %{enable_webservice} --enable-webservice \ %endif -%if %{enable_docs} -%else +%if !%{enable_docs} --disable-docs \ %endif @@ -442,8 +443,8 @@ install -p -m 0644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-vboxguest.rules # Install modules load script -install -p -m 0755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}.conf -install -p -m 0755 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}-guest.conf +install -p -m 0644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}.conf +install -p -m 0644 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}-guest.conf # Module Source Code mkdir -p %{name}-kmod-%{version} @@ -619,6 +620,9 @@ %changelog +* Fri May 02 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.10-2 +- Rebuild for new x11-xorg-server + * Mon Mar 31 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.10-1 - In vboxvideo guest drive, don't patch the source code of Mesa part that use glapi and use bundled x11include/mesa-7.2 headers of Mesa, which btw rawhide doesn't have it, F20 have glapi in xorg-x11-server-source, but by what --- VirtualBox-4.2.6-gcc48.patch DELETED ---