rpms/VirtualBox-OSE/F-12 VirtualBox-OSE-3.1.0-visibility.patch, NONE,
1.1 .cvsignore, 1.11, 1.12 VirtualBox-OSE-3.1.0-strings.patch,
1.1, 1.2 VirtualBox-OSE.spec, 1.36, 1.37 sources, 1.11,
1.12 VirtualBox-OSE-3.0.4-visibility.patch, 1.1,
NONE VirtualBox-OSE-90-vboxdrv.rules.hardening, 1.2, NONE
Lubomir Rintel
lkundrak at rpmfusion.org
Tue Jan 26 15:45:18 CET 2010
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6765/F-12
Modified Files:
.cvsignore VirtualBox-OSE-3.1.0-strings.patch
VirtualBox-OSE.spec sources
Added Files:
VirtualBox-OSE-3.1.0-visibility.patch
Removed Files:
VirtualBox-OSE-3.0.4-visibility.patch
VirtualBox-OSE-90-vboxdrv.rules.hardening
Log Message:
Merge from devel
VirtualBox-OSE-3.1.0-visibility.patch:
Config.kmk | 2 +-
src/VBox/Main/webservice/websrv-nsmap.xsl | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE VirtualBox-OSE-3.1.0-visibility.patch ---
Hack to fix up build of gsoap bindings on Rawhide.
Still needs to be looked into.
Lubomir Rintel <lkundrak at v3.sk>
diff -up VirtualBox-3.1.0_OSE/Config.kmk.visibility VirtualBox-3.1.0_OSE/Config.kmk
--- VirtualBox-3.1.0_OSE/Config.kmk.visibility 2009-11-30 20:51:47.000000000 +0100
+++ VirtualBox-3.1.0_OSE/Config.kmk 2009-11-30 20:58:22.495779448 +0100
@@ -2508,7 +2508,7 @@ ifeq ($(KBUILD_TARGET),win)
else # the gcc guys
TEMPLATE_VBOXR3EXE_TOOL = $(VBOX_GCC_TOOL)
-TEMPLATE_VBOXR3EXE_CXXFLAGS = -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden)
+TEMPLATE_VBOXR3EXE_CXXFLAGS = -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-inlines-hidden)
TEMPLATE_VBOXR3EXE_CXXFLAGS.x86 = -m32
TEMPLATE_VBOXR3EXE_CXXFLAGS.amd64 = -m64
# L4 currently can't handle exception handling.
diff -up VirtualBox-3.1.0_OSE/src/VBox/Main/webservice/websrv-nsmap.xsl.visibility VirtualBox-3.1.0_OSE/src/VBox/Main/webservice/websrv-nsmap.xsl
--- VirtualBox-3.1.0_OSE/src/VBox/Main/webservice/websrv-nsmap.xsl.visibility 2009-03-13 11:39:18.000000000 +0100
+++ VirtualBox-3.1.0_OSE/src/VBox/Main/webservice/websrv-nsmap.xsl 2009-11-30 20:51:48.101779959 +0100
@@ -49,6 +49,7 @@
* Generated from: src/VBox/Main/idl/VirtualBox.xidl (VirtualBox's interface definitions in XML)
* Generator: src/VBox/Main/webservice/websrv-nsmap.xsl */
+#pragma GCC visibility push(default)
#include "soapH.h"
SOAP_NMAC struct Namespace namespaces[] =
{
@@ -64,6 +65,7 @@ SOAP_NMAC struct Namespace namespaces[]
<xsl:text><![CDATA[
{NULL, NULL, NULL, NULL}
};
+#pragma GCC visibility pop
]]></xsl:text>
</xsl:template>
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 12 Nov 2009 16:24:20 -0000 1.11
+++ .cvsignore 26 Jan 2010 14:45:17 -0000 1.12
@@ -1 +1,2 @@
-VirtualBox-3.1.0_BETA1_OSE.tar.bz2
+UserManual.pdf
+VirtualBox-3.1.2-OSE.tar.bz2
VirtualBox-OSE-3.1.0-strings.patch:
Frontends/VirtualBox/src/main.cpp | 18 +++++++++---------
Installer/linux/VBox.sh | 11 ++++++-----
Installer/linux/virtualbox.desktop | 2 +-
VMM/VM.cpp | 8 ++++----
4 files changed, 20 insertions(+), 19 deletions(-)
Index: VirtualBox-OSE-3.1.0-strings.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-12/VirtualBox-OSE-3.1.0-strings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-3.1.0-strings.patch 12 Nov 2009 16:24:20 -0000 1.1
+++ VirtualBox-OSE-3.1.0-strings.patch 26 Jan 2010 14:45:17 -0000 1.2
@@ -3,14 +3,14 @@
Lubomir Rintel <lkundrak at v3.sk>
diff -up VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings 2009-11-05 17:53:04.000000000 +0100
-+++ VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-11-12 15:34:13.000000000 +0100
+--- VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings 2009-11-20 07:46:44.000000000 +0100
++++ VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-11-22 01:13:05.266805602 +0100
@@ -72,13 +72,13 @@ QString g_QStrHintLinuxNoMemory = QAppli
);
QString g_QStrHintLinuxNoDriver = QApplication::tr(
- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
-- "there is a permission problem with /dev/vboxdrv. Re-setup the kernel "
+- "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
- "module by executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
@@ -33,14 +33,14 @@
-/* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
+/* We're going to try to give a helping hand */
QString g_QStrHintReinstall = QApplication::tr(
-- "It may help to reinstall VirtualBox."
+- "Please try reinstalling VirtualBox."
+ "Please report the problem to the RPM Fusion Bugzilla."
);
#if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
diff -up VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh.strings VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh
--- VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh.strings 2009-11-05 17:54:06.000000000 +0100
-+++ VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh 2009-11-12 15:34:13.000000000 +0100
++++ VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh 2009-11-22 01:10:57.110802086 +0100
@@ -36,19 +36,20 @@ elif ! lsmod|grep -q vboxdrv; then
cat << EOF
WARNING: The vboxdrv kernel module is not loaded. Either there is no module
@@ -69,7 +69,7 @@
EOF
diff -up VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop.strings VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop
--- VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop.strings 2009-09-01 13:22:55.000000000 +0200
-+++ VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop 2009-11-12 15:34:13.000000000 +0100
++++ VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop 2009-11-22 01:10:57.114801682 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
@@ -80,8 +80,8 @@
Type=Application
Exec=VirtualBox
diff -up VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp.strings VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp
---- VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp.strings 2009-11-10 16:47:29.000000000 +0100
-+++ VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp 2009-11-12 15:34:13.000000000 +0100
+--- VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp.strings 2009-11-20 07:46:35.000000000 +0100
++++ VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp 2009-11-22 01:10:57.127800658 +0100
@@ -336,8 +336,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-12/VirtualBox-OSE.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- VirtualBox-OSE.spec 12 Nov 2009 16:47:53 -0000 1.36
+++ VirtualBox-OSE.spec 26 Jan 2010 14:45:17 -0000 1.37
@@ -1,83 +1,73 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
# Standard compiler flags, without:
-# -Wall -- VirtualBox-OSE takes care of reasonable warning very well
+# -Wall -- VirtualBox-OSE takes care of reasonable warning very well
# -m32, -m64 -- 32bit code is built besides 64bit on x86_64
# -fexceptions -- R0 code doesn't link against C++ library, no __gxx_personality_v0
%global optflags %(rpm --eval %%optflags |sed 's/-Wall//;s/-m[0-9][0-9]//;s/-fexceptions//')
-# Do not disable hardening for anything but debugging!
-%bcond_without hardening
-
-%if %with hardening
-%define priv_mode %%attr(4755,root,root)
-%else
-%define priv_mode %%caps(cap_net_raw+ep)
-%endif
-
-Name: VirtualBox-OSE
-Version: 3.1.0
-Release: 0.1.beta1%{?dist}
-Summary: A general-purpose full virtualizer for PC hardware
-
-Group: Development/Tools
-License: GPLv2 or (GPLv2 and CDDL)
-URL: http://www.virtualbox.org/wiki/VirtualBox
-Source0: http://download.virtualbox.org/virtualbox/%{version}_BETA1/VirtualBox-%{version}_BETA1_OSE.tar.bz2
-Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
-Source3: VirtualBox-OSE-90-vboxdrv.rules
-Source4: VirtualBox-OSE-90-vboxdrv.rules.hardening
-Source5: VirtualBox-OSE-60-vboxguest.rules
-Source6: VirtualBox-OSE.modules
-Source7: VirtualBox-OSE-guest.modules
-Source8: VirtualBox-OSE-vboxresize.desktop
-Source9: VirtualBox-OSE.blacklist-kvm
-Patch1: VirtualBox-OSE-3.1.0-noupdate.patch
-Patch2: VirtualBox-OSE-3.1.0-strings.patch
-Patch3: VirtualBox-OSE-3.1.0-libcxx.patch
-Patch5: VirtualBox-OSE-3.1.0-xorg17.patch
-Patch9: VirtualBox-OSE-3.0.4-optflags.patch
-Patch10: VirtualBox-OSE-2.2.0-32bit.patch
-Patch11: VirtualBox-OSE-3.0.4-visibility.patch
-Patch12: VirtualBox-OSE-3.0.4-noansi.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: kBuild >= 0.1.5-1
-BuildRequires: SDL-devel xalan-c-devel
-BuildRequires: hal-devel
-BuildRequires: openssl-devel
-BuildRequires: libcurl-devel
-BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libXcursor-devel libIDL-devel
-BuildRequires: yasm
-BuildRequires: pulseaudio-libs-devel
-BuildRequires: libXmu-devel
-BuildRequires: python-devel
-BuildRequires: desktop-file-utils
-BuildRequires: libcap-devel
-BuildRequires: qt4-devel
-BuildRequires: gsoap-devel
-BuildRequires: xz
+Name: VirtualBox-OSE
+Version: 3.1.2
+Release: 1%{?dist}
+Summary: A general-purpose full virtualizer for PC hardware
+
+Group: Development/Tools
+License: GPLv2 or (GPLv2 and CDDL)
+URL: http://www.virtualbox.org/wiki/VirtualBox
+Source0: http://download.virtualbox.org/virtualbox/%{version}/VirtualBox-%{version}-OSE.tar.bz2
+Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
+Source3: VirtualBox-OSE-90-vboxdrv.rules
+Source5: VirtualBox-OSE-60-vboxguest.rules
+Source6: VirtualBox-OSE.modules
+Source7: VirtualBox-OSE-guest.modules
+Source8: VirtualBox-OSE-vboxresize.desktop
+Source9: VirtualBox-OSE.blacklist-kvm
+Patch1: VirtualBox-OSE-3.1.0-noupdate.patch
+Patch2: VirtualBox-OSE-3.1.0-strings.patch
+Patch3: VirtualBox-OSE-3.1.0-libcxx.patch
+Patch5: VirtualBox-OSE-3.1.0-xorg17.patch
+Patch9: VirtualBox-OSE-3.0.4-optflags.patch
+Patch10: VirtualBox-OSE-2.2.0-32bit.patch
+Patch11: VirtualBox-OSE-3.1.0-visibility.patch
+Patch12: VirtualBox-OSE-3.0.4-noansi.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: kBuild >= 0.1.5-1
+BuildRequires: SDL-devel xalan-c-devel
+BuildRequires: hal-devel
+BuildRequires: openssl-devel
+BuildRequires: libcurl-devel
+BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libXcursor-devel libIDL-devel
+BuildRequires: yasm
+BuildRequires: pulseaudio-libs-devel
+BuildRequires: libXmu-devel
+BuildRequires: python-devel
+BuildRequires: desktop-file-utils
+BuildRequires: libcap-devel
+BuildRequires: qt4-devel
+BuildRequires: gsoap-devel
+BuildRequires: xz
# For the X11 module
-BuildRequires: libdrm-devel
-BuildRequires: libpciaccess-devel
-BuildRequires: mesa-libGL-devel
-BuildRequires: pixman-devel
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-server-source
+BuildRequires: libdrm-devel
+BuildRequires: libpciaccess-devel
+BuildRequires: mesa-libGL-devel
+BuildRequires: pixman-devel
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: xorg-x11-server-source
# Plague-specific weirdness
%if 0%{?fedora} > 11
-ExclusiveArch: i686 x86_64
+ExclusiveArch: i686 x86_64
%else %if 0%{?fedora} > 10
-ExclusiveArch: i586 x86_64
+ExclusiveArch: i586 x86_64
%else
-ExclusiveArch: i386 x86_64
+ExclusiveArch: i386 x86_64
%endif
-Requires: %{name}-kmod = %{version}
-Provides: %{name}-kmod-common = %{version}
+Requires: %{name}-kmod = %{version}
+Provides: %{name}-kmod-common = %{version}
%description
A general-purpose full virtualizer and emulator for 32-bit and
@@ -85,34 +75,34 @@
%package devel
-Summary: %{name} SDK
-Group: Development/Libraries
-Requires: VirtualBox-OSE = %{version}-%{release}
-Requires: python-VirtualBox-OSE = %{version}-%{release}
+Summary: %{name} SDK
+Group: Development/Libraries
+Requires: VirtualBox-OSE = %{version}-%{release}
+Requires: python-VirtualBox-OSE = %{version}-%{release}
%description devel
%{name} Software Development Kit.
%package -n python-%{name}
-Summary: Python bindings for %{name}
-Group: Development/Libraries
-Requires: VirtualBox-OSE = %{version}-%{release}
+Summary: Python bindings for %{name}
+Group: Development/Libraries
+Requires: VirtualBox-OSE = %{version}-%{release}
%description -n python-%{name}
Python XPCOM bindings to %{name}.
%package guest
-Summary: %{name} Guest Additions
-Group: System Environment/Base
-Requires: %{name}-kmod = %{version}
-Provides: %{name}-kmod-common = %{version}
-Requires: hal
-Requires: xorg-x11-server-Xorg
-Requires: xorg-x11-xinit
-Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
-Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release}
+Summary: %{name} Guest Additions
+Group: System Environment/Base
+Requires: %{name}-kmod = %{version}
+Provides: %{name}-kmod-common = %{version}
+Requires: hal
+Requires: xorg-x11-server-Xorg
+Requires: xorg-x11-xinit
+Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
+Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release}
%description guest
Tools that utilize kernel modules for supporting integration
@@ -121,8 +111,8 @@
%package kmodsrc
-Summary: %{name} kernel module source code
-Group: System Environment/Kernel
+Summary: %{name} kernel module source code
+Group: System Environment/Kernel
%description kmodsrc
Source tree used for building kernel module packages (%{name}-kmod)
@@ -152,7 +142,6 @@
%build
./configure --disable-kmods --enable-webservice \
- %{!?with_hardening:--disable-hardening}
. ./env.sh
@@ -161,13 +150,12 @@
# really been installed to. Therefore we do not override any of
# the installation paths, but install the tree with the default
# layout under 'obj' and shuffle files around in %%install.
-
echo %{optflags}
-kmk KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_INS="$PWD/obj" \
- VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
- KMK_REVISION=3000 KBUILD_KMK_REVISION=3000 \
- VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \
- VBOX_GCC_R0_OPT="%{optflags}"
+kmk KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_INS="$PWD/obj" \
+ VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
+ KMK_REVISION=3000 KBUILD_KMK_REVISION=3000 \
+ VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \
+ VBOX_GCC_R0_OPT="%{optflags}"
%install
@@ -196,52 +184,53 @@
ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VirtualBox
install -p -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
- obj/bin/VBoxTunctl \
- obj/bin/VBoxBFE
+ obj/bin/VBoxTunctl \
+ obj/bin/VBoxBFE
# Components
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/components \
- obj/bin/components/*
+ obj/bin/components/*
# Lib
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/*.so
+ obj/bin/*.so
install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/V*.gc \
- obj/bin/V*.r0
+ obj/bin/V*.gc \
+ obj/bin/V*.r0 \
+ obj/bin/VBoxEFI*.fd
# Executabes
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/EfiThunk \
- obj/bin/VBoxHeadless \
- obj/bin/VBoxSDL \
- obj/bin/VBoxNetDHCP \
- obj/bin/VBoxNetAdpCtl \
- obj/bin/VirtualBox \
- obj/bin/VBoxManage \
- obj/bin/VBoxSVC \
- obj/bin/VBoxXPCOMIPCD \
- obj/bin/VBoxSysInfo.sh \
- obj/bin/vboxshell.py \
- obj/bin/VBoxTestOGL \
- obj/bin/vboxwebsrv \
- obj/bin/webtest
+ obj/bin/EfiThunk \
+ obj/bin/VBoxHeadless \
+ obj/bin/VBoxSDL \
+ obj/bin/VBoxNetDHCP \
+ obj/bin/VBoxNetAdpCtl \
+ obj/bin/VirtualBox \
+ obj/bin/VBoxManage \
+ obj/bin/VBoxSVC \
+ obj/bin/VBoxXPCOMIPCD \
+ obj/bin/VBoxSysInfo.sh \
+ obj/bin/vboxshell.py \
+ obj/bin/VBoxTestOGL \
+ obj/bin/vboxwebsrv \
+ obj/bin/webtest
# Language files
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \
- obj/bin/nls/*
+ obj/bin/nls/*
# SDK
cp -rp obj/bin/sdk/. $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk
mv $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom \
- $RPM_BUILD_ROOT%{python_sitelib}/virtualbox
+ $RPM_BUILD_ROOT%{python_sitelib}/virtualbox
ln -sf ../../../../../../..%{python_sitelib}/virtualbox/xpcom \
- $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom
+ $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom
# Icon
install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
- obj/bin/VBox.png
+ obj/bin/VBox.png
# Guest X.Org drivers
# With the xorg17 patch, the _17 driver builds against what's
@@ -250,48 +239,46 @@
%global x11_api 17
install -m 0755 -D obj/bin/additions/vboxmouse_drv_%{x11_api}.so \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxmouse_drv.so
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxmouse_drv.so
install -m 0755 -D obj/bin/additions/vboxvideo_drv_%{x11_api}.so \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
install -m 0755 -D src/VBox/Additions/linux/installer/90-vboxguest.fdi \
- $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
+ $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
# Guest tools
-install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
- obj/bin/additions/mount.vboxsf \
- obj/bin/additions/VBoxService \
- obj/bin/additions/VBoxClient \
- obj/bin/additions/VBoxControl
+install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
+ obj/bin/additions/mount.vboxsf \
+ obj/bin/additions/VBoxService \
+ obj/bin/additions/VBoxClient \
+ obj/bin/additions/VBoxControl
install -m 0755 src/VBox/Additions/x11/Installer/VBoxRandR.sh \
- $RPM_BUILD_ROOT%{_bindir}/VBoxRandR
+ $RPM_BUILD_ROOT%{_bindir}/VBoxRandR
install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
- $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
+ $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
install -m 0755 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
- $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+ $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
install -m 0755 -D %{SOURCE8} \
- $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
+ $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
# Guest libraries
-install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} \
- obj/bin/additions/VBoxOGL*.so
+install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} \
+ obj/bin/additions/VBoxOGL*.so
ln -sf ../VBoxOGL.so $RPM_BUILD_ROOT%{_libdir}/dri/vboxvideo_dri.so
-
# Installation root configuration
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vbox
echo 'INSTALL_DIR=%{_libdir}/virtualbox' > $RPM_BUILD_ROOT/%{_sysconfdir}/vbox/vbox.cfg
# Install udev rules
-%define vboxdrv_udev %{?with_hardening:%{SOURCE4}}%{?!with_hardening:%{SOURCE3}}
-install -p -m 0644 -D %{vboxdrv_udev} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
+install -p -m 0644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
install -p -m 0644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-vboxguest.rules
# Install modules load script
@@ -304,12 +291,12 @@
cp -al obj/bin/src/vbox* obj/bin/additions/src/vbox* %{name}-kmod-%{version}
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version}
tar --use-compress-program xz -cf $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version}/%{name}-kmod-%{version}.tar.xz \
- %{name}-kmod-%{version}
+ %{name}-kmod-%{version}
# Menu entry
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --remove-key=DocPath --remove-category=X-MandrivaLinux-System \
- --vendor='' src/VBox/Installer/linux/virtualbox.desktop
+ --remove-key=DocPath --remove-category=X-MandrivaLinux-System \
+ --vendor='' src/VBox/Installer/linux/virtualbox.desktop
%check
@@ -326,25 +313,25 @@
# it? Bring it back.
set +o posix
-diff -u <((find obj/bin/additions/* -maxdepth 0 -type f \
- -not -name 'autorun.sh' \
- -not -name '*_drv*' \
- -exec basename '{}' \;
- find obj/bin/* -maxdepth 0 -type f \
- -not -name 'tst*' \
- -not -name 'SUP*' \
- -not -name 'VBox.sh' \
- -not -name 'xpidl' \
- -not -name 'vboxkeyboard.tar.gz' \
- -exec basename '{}' \;) |sort) \
- <(find $RPM_BUILD_ROOT%{_libdir}/virtualbox/* \
- $RPM_BUILD_ROOT%{_bindir}/* \
- $RPM_BUILD_ROOT%{_libdir}/*OGL*.so \
- $RPM_BUILD_ROOT%{_datadir}/{pixmaps,applications}/* \
- -maxdepth 0 -type f \
- -not -name '*.py[co]' \
- -not -name VBoxRandR \
- -not -name VBox -exec basename '{}' \; |sort)
+diff -u <((find obj/bin/additions/* -maxdepth 0 -type f \
+ -not -name 'autorun.sh' \
+ -not -name '*_drv*' \
+ -exec basename '{}' \;
+ find obj/bin/* -maxdepth 0 -type f \
+ -not -name 'tst*' \
+ -not -name 'SUP*' \
+ -not -name 'VBox.sh' \
+ -not -name 'xpidl' \
+ -not -name 'vboxkeyboard.tar.gz' \
+ -exec basename '{}' \;) |sort) \
+ <(find $RPM_BUILD_ROOT%{_libdir}/virtualbox/* \
+ $RPM_BUILD_ROOT%{_bindir}/* \
+ $RPM_BUILD_ROOT%{_libdir}/*OGL*.so \
+ $RPM_BUILD_ROOT%{_datadir}/{pixmaps,applications}/* \
+ -maxdepth 0 -type f \
+ -not -name '*.py[co]' \
+ -not -name VBoxRandR \
+ -not -name VBox -exec basename '{}' \; |sort)
set -o posix
@@ -384,11 +371,11 @@
%{_libdir}/virtualbox/vboxwebsrv
%{_libdir}/virtualbox/webtest
%{_libdir}/virtualbox/EfiThunk
-%{priv_mode} %{_libdir}/virtualbox/VBoxHeadless
-%{priv_mode} %{_libdir}/virtualbox/VBoxSDL
-%{priv_mode} %{_libdir}/virtualbox/VBoxNetDHCP
-%{priv_mode} %{_libdir}/virtualbox/VBoxNetAdpCtl
-%{priv_mode} %{_libdir}/virtualbox/VirtualBox
+%attr(4755,root,root) %{_libdir}/virtualbox/VBoxHeadless
+%attr(4755,root,root) %{_libdir}/virtualbox/VBoxSDL
+%attr(4755,root,root) %{_libdir}/virtualbox/VBoxNetDHCP
+%attr(4755,root,root) %{_libdir}/virtualbox/VBoxNetAdpCtl
+%attr(4755,root,root) %{_libdir}/virtualbox/VirtualBox
%{_datadir}/pixmaps/*
%{_datadir}/applications/*.desktop
%config %{_sysconfdir}/vbox/vbox.cfg
@@ -420,7 +407,6 @@
%{_libdir}/VBoxOGL*.so
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
%{_sysconfdir}/xdg/autostart/vboxclient.desktop
-# %{_datadir}/gdm/autostart/LoginWindow
%exclude %{_datadir}/gdm
%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
%config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
@@ -434,6 +420,15 @@
%changelog
+* Tue Jan 26 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.1.2-1
+- New upstream release
+
+* Mon Nov 30 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.1.0-1
+- Upstream release (they do that quite often, huh?)
+
+* Sat Nov 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.1.0-0.1.beta2
+- Another upstream beta
+
* Thu Nov 12 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.1.0-0.1.beta1
- Upstream beta release
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 12 Nov 2009 16:24:20 -0000 1.11
+++ sources 26 Jan 2010 14:45:17 -0000 1.12
@@ -1 +1,2 @@
-851986a826c1ef2ec71bd82a59e79a21 VirtualBox-3.1.0_BETA1_OSE.tar.bz2
+052357bb684515035b3e561b35a1d6f2 UserManual.pdf
+e7808f16114f5b1a65aa2df1aa33e1a7 VirtualBox-3.1.2-OSE.tar.bz2
--- VirtualBox-OSE-3.0.4-visibility.patch DELETED ---
--- VirtualBox-OSE-90-vboxdrv.rules.hardening DELETED ---
More information about the rpmfusion-commits
mailing list