rpms/VirtualBox/F-20 .cvsignore, 1.54, 1.55 VirtualBox-4.3.0-libcxx.patch, 1.3, 1.4 VirtualBox.spec, 1.59, 1.60 sources, 1.54, 1.55

Sérgio M. Basto sergiomb at rpmfusion.org
Sun Jul 27 21:30:30 CEST 2014


Author: sergiomb

Update of /cvs/free/rpms/VirtualBox/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3462

Modified Files:
	.cvsignore VirtualBox-4.3.0-libcxx.patch VirtualBox.spec 
	sources 
Log Message:
* Tue Jul 15 2014 Sérgio Basto <sergio at serjux.com> - 4.3.14-1
- New upstream release .



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-20/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	17 May 2014 00:54:26 -0000	1.54
+++ .cvsignore	27 Jul 2014 19:30:30 -0000	1.55
@@ -1 +1 @@
-VirtualBox-4.3.12.tar.bz2
+VirtualBox-4.3.14.tar.bz2

VirtualBox-4.3.0-libcxx.patch:
 ./src/VBox/Runtime/Makefile.kmk                             |    2 +-
 ./src/VBox/Storage/testcase/Makefile.kmk                    |    4 ++--
 ./src/libs/kStuff/Makefile.kmk                              |    2 +-
 Config.kmk                                                  |    2 +-
 b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk |    2 +-
 b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk            |    4 +---
 b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk              |   12 ++++++------
 b/src/VBox/HostDrivers/win/Makefile.kmk                     |    2 +-
 b/src/VBox/Installer/win/InstallHelper/Makefile.kmk         |    2 +-
 b/src/VBox/Installer/win/Resources/Makefile.kmk             |    2 +-
 configure                                                   |    2 +-
 src/VBox/Installer/win/Stub/Makefile.kmk                    |    2 +-
 src/libs/liblzf-3.4/Makefile.kmk                            |    2 +-
 13 files changed, 19 insertions(+), 21 deletions(-)

Index: VirtualBox-4.3.0-libcxx.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-20/VirtualBox-4.3.0-libcxx.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VirtualBox-4.3.0-libcxx.patch	31 Mar 2014 01:23:06 -0000	1.3
+++ VirtualBox-4.3.0-libcxx.patch	27 Jul 2014 19:30:30 -0000	1.4
@@ -23,15 +23,6 @@
  
  #
  # SDKs for external libraries.
-@@ -3784,7 +3776,7 @@ endif
- # Unlike VBOXR3STATIC, this is strict wrt warnings and includes IPRT.
- #
- TEMPLATE_VBoxR3Static               = New name for VBOXR3STATIC
--TEMPLATE_VBoxR3Static_EXTENDS       = VBOXR3STATIC
-+TEMPLATE_VBoxR3Static_EXTENDS       = VBOXR3EXE
- TEMPLATE_VBoxR3Static_EXTENDS_BY    = appending
- TEMPLATE_VBoxR3Static_SDKS         += VBOX_OPENSSL
- TEMPLATE_VBoxR3Static_SDKS.win     += VBOX_NTDLL
 --- a/configure
 +++ b/configure
 @@ -2582,7 +2582,7 @@ fi
@@ -67,17 +58,6 @@
  ifdef VBOX_X11_SEAMLESS_GUEST
   VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE
   VBoxClient_SOURCES += \
---- a/src/VBox/HostDrivers/Support/Makefile.kmk.orig	2012-09-02 03:06:50.648190033 +0100
-+++ b/src/VBox/HostDrivers/Support/Makefile.kmk	2012-09-02 03:04:52.703001504 +0100
-@@ -94,7 +94,7 @@ SUPR3_SOURCES       = \
- #
- # Static version of SUPR3.
- #
--SUPR3Static_TEMPLATE = VBOXR3STATIC
-+SUPR3Static_TEMPLATE = VBOXR3EXE
- SUPR3Static_EXTENDS = SUPR3
- 
- #
 --- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk.libcxx	2012-08-29 15:13:46.000000000 +0100
 +++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk	2012-09-02 02:49:31.198721147 +0100
 @@ -143,7 +143,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet
@@ -209,17 +189,6 @@
  VBox-liblzf-static_BLD_TYPE   = $(VBox-liblzf_BLD_TYPE)
  VBox-liblzf-static_DEFS       = $(VBox-liblzf_DEFS)
  VBox-liblzf-static_DEFS.x86   = $(VBox-liblzf_DEFS.x86)
---- ./src/VBox/Runtime/Makefile.kmk.libcxx	2013-10-15 12:13:19.000000000 +0100
-+++ ./src/VBox/Runtime/Makefile.kmk	2013-10-28 03:08:32.053146036 +0000
-@@ -232,7 +232,7 @@ endif
- #
- # RuntimeR3 - Static Runtime for Ring-3 executables.
- #
--RuntimeR3_TEMPLATE      = VBoxR3Static
-+RuntimeR3_TEMPLATE      = VBOXR3EXE
- RuntimeR3_SDKS          = VBOX_OPENSSL VBOX_LIBXML2
- RuntimeR3_SDKS.win      = $(VBOX_WINPSDK) $(VBOX_WINDDK)
- RuntimeR3_DEFS          = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX RT_NO_GIP
 --- ./src/libs/kStuff/Makefile.kmk.orig	2012-12-27 18:36:01.629728244 +0000
 +++ ./src/libs/kStuff/Makefile.kmk	2012-12-27 18:36:11.876827415 +0000
 @@ -75,7 +75,7 @@ VBox-kStuff_SOURCES = \
@@ -231,3 +200,14 @@
  VBox-kStuffStatic_EXTENDS = VBox-kStuff
  
  
+--- ./src/VBox/Runtime/Makefile.kmk.libcxx	2014-07-15 23:08:58.294017830 +0100
++++ ./src/VBox/Runtime/Makefile.kmk	2014-07-15 23:12:41.365417070 +0100
+@@ -221,7 +221,7 @@ endif
+ #
+ # RuntimeR3 - Static Runtime for Ring-3 executables.
+ #
+-RuntimeR3_TEMPLATE      = VBoxR3Static
++RuntimeR3_TEMPLATE      = VBOXR3EXE
+ RuntimeR3_SDKS          = VBOX_OPENSSL VBOX_LIBXML2
+ RuntimeR3_SDKS.win      = $(VBOX_WINPSDK) $(VBOX_WINDDK)
+ RuntimeR3_DEFS          = \


Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-20/VirtualBox.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- VirtualBox.spec	17 May 2014 00:54:26 -0000	1.59
+++ VirtualBox.spec	27 Jul 2014 19:30:30 -0000	1.60
@@ -26,7 +26,7 @@
 #endif
 
 Name:       VirtualBox
-Version:    4.3.12
+Version:    4.3.14
 Release:    1%{?prerel:.%{prerel}}%{?dist}
 Summary:    A general-purpose full virtualizer for PC hardware
 
@@ -54,9 +54,7 @@
 Patch26:    VirtualBox-4.3.0-no-bundles.patch
 Patch27:    VirtualBox-4.3.10-gcc.patch
 
-%if 0%{?fedora} < 16
-BuildRequires:  kBuild >= 0.1.98
-%endif
+BuildRequires:  kBuild >= 0.1.9998
 BuildRequires:  SDL-devel xalan-c-devel
 BuildRequires:  openssl-devel
 BuildRequires:  libcurl-devel
@@ -85,7 +83,7 @@
 BuildRequires:  libxml2-devel
 BuildRequires:  libpng-devel
 BuildRequires:  zlib-devel
-BuildRequires:  device-mapper-devel
+BuildRequires:  device-mapper-devel device-mapper-libs
 BuildRequires:  libvpx-devel
 BuildRequires:  makeself
 
@@ -202,9 +200,7 @@
 find -name '*.py[co]' -delete
 
 # Remove prebuilt binary tools 
-%if 0%{?fedora} < 16
 rm -rf kBuild
-%endif
 rm -rf tools
 # Remove bundle X11 sources and some lib sources, before patching.
 mv src/VBox/Additions/x11/x11include/mesa-7.2 .
@@ -234,7 +230,7 @@
 %patch23 -p1 -b .xserver_guest
 %patch24 -p1 -b .guestlib
 %patch26 -p1 -b .nobundles
-%patch27 -p1 -b .gcc
+#patch27 -p1 -b .gcc
 
 # CRLF->LF
 sed -i 's/\r//' COPYING
@@ -620,6 +616,9 @@
 
 
 %changelog
+* Tue Jul 15 2014 Sérgio Basto <sergio at serjux.com> - 4.3.14-1
+- New upstream release .
+
 * Fri May 16 2014 Sérgio Basto <sergio at serjux.com> - 4.3.12-1
 - New upstream release .
 - Rename and split X11 and mesa (for guest) patches .


Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-20/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	17 May 2014 00:54:26 -0000	1.54
+++ sources	27 Jul 2014 19:30:30 -0000	1.55
@@ -1 +1 @@
-b31908e98f6c271c59b97ce8154e31da  VirtualBox-4.3.12.tar.bz2
+407099867bd9786e23619b5c11611e53  VirtualBox-4.3.14.tar.bz2


More information about the rpmfusion-commits mailing list