rpms/VirtualBox-OSE/devel VirtualBox-OSE-2.2.0-32bit.patch, NONE,
1.1 VirtualBox-OSE-2.2.0-noupdate.patch, NONE,
1.1 VirtualBox-OSE-2.2.2-strings.patch, NONE, 1.1 .cvsignore,
1.2, 1.3 VirtualBox-OSE-90-vboxdrv.rules, 1.1,
1.2 VirtualBox-OSE.modules, 1.1, 1.2 VirtualBox-OSE.spec, 1.3,
1.4 sources, 1.2, 1.3 VirtualBox-OSE-1.6.4-desktop.patch, 1.1,
NONE VirtualBox-OSE-2.0.2-setup.patch, 1.1,
NONE VirtualBox-OSE-2.1.0-32bit.patch, 1.1,
NONE VirtualBox-OSE-2.1.0-icons.patch, 1.1,
NONE VirtualBox-OSE-2.1.2-gcc44.patch, 1.1,
NONE VirtualBox-OSE-2.1.4-libcap.patch, 1.1,
NONE VirtualBox-OSE-2.1.4-swab.patch, 1.1,
NONE VirtualBox-OSE.desktop, 1.1, NONE
Lubomir Rintel
lkundrak at rpmfusion.org
Sun May 3 16:24:15 CEST 2009
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9014
Modified Files:
.cvsignore VirtualBox-OSE-90-vboxdrv.rules
VirtualBox-OSE.modules VirtualBox-OSE.spec sources
Added Files:
VirtualBox-OSE-2.2.0-32bit.patch
VirtualBox-OSE-2.2.0-noupdate.patch
VirtualBox-OSE-2.2.2-strings.patch
Removed Files:
VirtualBox-OSE-1.6.4-desktop.patch
VirtualBox-OSE-2.0.2-setup.patch
VirtualBox-OSE-2.1.0-32bit.patch
VirtualBox-OSE-2.1.0-icons.patch
VirtualBox-OSE-2.1.2-gcc44.patch
VirtualBox-OSE-2.1.4-libcap.patch
VirtualBox-OSE-2.1.4-swab.patch VirtualBox-OSE.desktop
Log Message:
* Sun May 03 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2.2-1
- Damnit, another new upstream release! :)
- Improved packaging checks
- Upstream fixed libcap detection, drop patch
- Drop gcc44 patch, upstream supports it now
VirtualBox-OSE-2.2.0-32bit.patch:
--- NEW FILE VirtualBox-OSE-2.2.0-32bit.patch ---
Build on x86_64 without 32bit toolchain.
This disables the check for 32bit toolchain and tests that need it (boo).
Lubomir Rintel <lkundrak at v3.sk>
diff -up VirtualBox-2.2.0_OSE/configure.32bit VirtualBox-2.2.0_OSE/configure
--- VirtualBox-2.2.0_OSE/configure.32bit 2009-03-27 20:13:58.000000000 +0100
+++ VirtualBox-2.2.0_OSE/configure 2009-04-25 06:58:14.816362844 +0200
@@ -2160,7 +2160,7 @@ if [ "$OS" = "linux" ]; then
fi
check_libcap
check_compiler_h
- [ "$BUILD_MACHINE" = "amd64" ] && check_32bit
+ #[ "$BUILD_MACHINE" = "amd64" ] && check_32bit
fi
[ -n "$SETUP_WINE" ] && setup_wine
diff -up VirtualBox-2.2.0_OSE/src/VBox/Devices/testcase/Makefile.kmk.32bit VirtualBox-2.2.0_OSE/src/VBox/Devices/testcase/Makefile.kmk
--- VirtualBox-2.2.0_OSE/src/VBox/Devices/testcase/Makefile.kmk.32bit 2009-03-13 11:38:48.000000000 +0100
+++ VirtualBox-2.2.0_OSE/src/VBox/Devices/testcase/Makefile.kmk 2009-04-25 06:58:14.807362039 +0200
@@ -33,22 +33,28 @@ BLDDIRS += $(VBOX_DEVICES_TEST_OUT_DIR)
# We setup one 'other' target for executing the structure & alignment
# validation testcases. Perhaps a bit hackish, but extremely useful.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
OTHERS += \
$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
endif
endif
+endif
# The normal testing pass.
+ifneq ($(KBUILD_HOST_ARCH),amd64)
TESTING += \
$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
+endif
#
# The testcase generator.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
PROGRAMS += tstDeviceStructSizeGC
+endif
tstDeviceStructSizeGC_TEMPLATE = VBOXGCEXE
tstDeviceStructSizeGC_DEFS =
ifdef VBOX_WITH_USB
@@ -81,7 +87,9 @@ tstDeviceStructSizeGC_INCS = \
#
# The testcase it self.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
PROGRAMS += tstDeviceStructSize
+endif
tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST
tstDeviceStructSize_DEFS =
ifdef VBOX_WITH_USB
diff -up VirtualBox-2.2.0_OSE/src/VBox/VMM/testcase/Makefile.kmk.32bit VirtualBox-2.2.0_OSE/src/VBox/VMM/testcase/Makefile.kmk
--- VirtualBox-2.2.0_OSE/src/VBox/VMM/testcase/Makefile.kmk.32bit 2009-04-07 21:32:47.000000000 +0200
+++ VirtualBox-2.2.0_OSE/src/VBox/VMM/testcase/Makefile.kmk 2009-04-25 07:00:54.512363102 +0200
@@ -25,7 +25,10 @@ include $(KBUILD_PATH)/subheader.kmk
#
# Target lists.
#
-PROGRAMS += tstVMStructSize tstVMStructGC tstAsmStructs tstAsmStructsGC tstVMM tstVMM-HwAccm tstGlobalConfig tstInstrEmul
+PROGRAMS += tstVMM tstVMM-HwAccm tstGlobalConfig tstInstrEmul
+ifneq ($(KBUILD_HOST_ARCH),amd64)
+ PROGRAMS += tstVMStructSize tstVMStructGC tstAsmStructs tstAsmStructsGC
+endif
ifneq ($(KBUILD_TARGET),win)
PROGRAMS += tstVMMFork
endif
@@ -51,16 +54,21 @@ BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR)
#
ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
+ ifneq ($(KBUILD_HOST_ARCH),amd64)
OTHERS += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
+ endif
endif
endif
# The normal testing pass.
+ifneq ($(KBUILD_HOST_ARCH),amd64)
TESTING += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
- $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run \
+ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
+endif
+TESTING += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run
OTHER_CLEAN += \
VirtualBox-OSE-2.2.0-noupdate.patch:
--- NEW FILE VirtualBox-OSE-2.2.0-noupdate.patch ---
Our OS provides superior way of dealing with updates (PackageKit).
Let's not bug the user with updates that are not yet packaged.
Lubomir Rintel <lkundrak at v3.sk>
diff -up VirtualBox-2.2.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp.noupdate VirtualBox-2.2.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp
--- VirtualBox-2.2.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp.noupdate 2009-05-03 11:04:39.000000000 +0200
+++ VirtualBox-2.2.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp 2009-05-03 11:05:19.000000000 +0200
@@ -160,12 +160,11 @@ void VBoxUpdateData::decode (const QStri
mDate = QDate::fromString (parser [1], Qt::ISODate);
}
- /* Incorrect values handles as 'once per day' mode.
+ /* Incorrect values handles as 'never' mode.
* This is the default value if there is no such extra-data. */
if (mIndex == -1 || !mDate.isValid())
{
- mIndex = 0;
- mDate = QDate::currentDate();
+ mIndex = NeverCheck;
}
}
}
VirtualBox-OSE-2.2.2-strings.patch:
--- NEW FILE VirtualBox-OSE-2.2.2-strings.patch ---
Replace some strings which ones that (sometimes) make more sense.
Lubomir Rintel <lkundrak at v3.sk>
diff -up VirtualBox-2.2.2_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings VirtualBox-2.2.2_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
--- VirtualBox-2.2.2_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings 2009-04-27 19:57:04.000000000 +0200
+++ VirtualBox-2.2.2_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-05-03 15:57:41.000000000 +0200
@@ -73,22 +73,22 @@ 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 "
- "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 "
- "package first. This package keeps track of Linux kernel changes and "
- "recompiles the vboxdrv kernel module if necessary."
+ "The VirtualBox Linux kernel driver (vboxdrv) is probably not "
+ "loaded.<br/><br/>"
+ "If you installed or VirtualBox OSE package recently you need to restart "
+ "the computer for the driver to load.<br/><br/>"
+ "Alternatively, you may attempt to load the driver by issuing the "
+ "following command with system administrator (root) privileges:<br/><br/>"
+ " <font color=blue>'/etc/sysconfig/modules/VirtualBox-OSE.modules'</font><br/><br/>"
);
QString g_QStrHintOtherNoDriver = QApplication::tr(
"Make sure the kernel module has been loaded successfully."
);
-/* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
+/* We're gonna try to give a helping hand. */
QString g_QStrHintReinstall = QApplication::tr(
- "It may help to reinstall VirtualBox."
+ "Please report the problem to the RPM Fusion Bugzilla."
);
#if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
diff -up VirtualBox-2.2.2_OSE/src/VBox/Installer/linux/VBox.sh.strings VirtualBox-2.2.2_OSE/src/VBox/Installer/linux/VBox.sh
--- VirtualBox-2.2.2_OSE/src/VBox/Installer/linux/VBox.sh.strings 2009-04-27 19:57:13.000000000 +0200
+++ VirtualBox-2.2.2_OSE/src/VBox/Installer/linux/VBox.sh 2009-05-03 15:57:41.000000000 +0200
@@ -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
available for the current kernel (`uname -r`) or it failed to
- load. Please recompile the kernel module and install it by
+ load. Reboot the computer, or insert the kernel module by executing
- sudo /etc/init.d/vboxdrv setup
+ '/etc/sysconfig/modules/VirtualBox-OSE.modules' (as root)
You will not be able to start VMs until this problem is fixed.
EOF
elif [ ! -c /dev/vboxdrv ]; then
cat << EOF
-WARNING: The character device /dev/vboxdrv does not exist. Try
+WARNING: The character device /dev/vboxdrv does not exist. Try running
- sudo /etc/init.d/vboxdrv restart
+ '/sbin/udevtrigger' (as root)
- and if that is not successful, try to re-install the package.
+ and if that is not successful, then you're in situation that
+ can not possibly happen and there's nothing you can do about it.
You will not be able to start VMs until this problem is fixed.
EOF
diff -up VirtualBox-2.2.2_OSE/src/VBox/Installer/linux/VirtualBox.desktop.strings VirtualBox-2.2.2_OSE/src/VBox/Installer/linux/VirtualBox.desktop
--- VirtualBox-2.2.2_OSE/src/VBox/Installer/linux/VirtualBox.desktop.strings 2009-04-27 19:57:14.000000000 +0200
+++ VirtualBox-2.2.2_OSE/src/VBox/Installer/linux/VirtualBox.desktop 2009-05-03 15:57:41.000000000 +0200
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Version=1.0
-Name=Sun VirtualBox
+Name=VirtualBox OSE
GenericName=Virtual Machine
Type=Application
Exec=VirtualBox
diff -up VirtualBox-2.2.2_OSE/src/VBox/VMM/VM.cpp.strings VirtualBox-2.2.2_OSE/src/VBox/VMM/VM.cpp
--- VirtualBox-2.2.2_OSE/src/VBox/VMM/VM.cpp.strings 2009-04-27 19:57:32.000000000 +0200
+++ VirtualBox-2.2.2_OSE/src/VBox/VMM/VM.cpp 2009-05-03 15:57:41.000000000 +0200
@@ -304,8 +304,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCP
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv is not set up properly. "
- "Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "Reboot the computer, or insert the kernel module by executing "
+ "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
@@ -346,8 +346,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCP
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv was not created for some "
- "reason. Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "reason. Insert the kernel module by executing "
+ "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 21 Apr 2009 06:26:11 -0000 1.2
+++ .cvsignore 3 May 2009 14:24:14 -0000 1.3
@@ -1,2 +1,2 @@
-VirtualBox-2.1.4-3-OSE.tar.bz2
+VirtualBox-2.2.2-OSE.tar.bz2
UserManual.pdf
Index: VirtualBox-OSE-90-vboxdrv.rules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE-90-vboxdrv.rules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-90-vboxdrv.rules 21 Apr 2009 06:26:11 -0000 1.1
+++ VirtualBox-OSE-90-vboxdrv.rules 3 May 2009 14:24:14 -0000 1.2
@@ -1 +1 @@
-ACTION=="add", DEVPATH=="/class/misc/vboxdrv", OWNER="root", MODE="0660", GROUP="vboxusers"
+ACTION=="add", DEVPATH=="/class/misc/vboxdrv", OWNER="root", MODE="0600"
Index: VirtualBox-OSE.modules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.modules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE.modules 21 Apr 2009 06:26:11 -0000 1.1
+++ VirtualBox-OSE.modules 3 May 2009 14:24:14 -0000 1.2
@@ -1,3 +1,8 @@
#!/bin/sh
-/sbin/modprobe vboxdrv &>/dev/null
-/sbin/modprobe vboxnetflt &>/dev/null
+
+# User is advised to run this on upgrades
+/sbin/rmmod vboxnetflt &>/dev/null ||:
+/sbin/rmmod vboxdrv &>/dev/null ||:
+
+/sbin/modprobe vboxdrv
+/sbin/modprobe vboxnetflt
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VirtualBox-OSE.spec 24 Apr 2009 20:42:04 -0000 1.3
+++ VirtualBox-OSE.spec 3 May 2009 14:24:14 -0000 1.4
@@ -4,29 +4,26 @@
# TODO: Remove executable bit temporarily to prevent stripping
%define debug_package %{nil}
-%define groupname vboxusers
+# Lots of useless checks
+# This will be enabled by default once RPM is built with caps enabled
+%bcond_without hardening
Name: VirtualBox-OSE
-Version: 2.1.4
-Release: 4%{?dist}
+Version: 2.2.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}-3-OSE.tar.bz2
+Source0: http://dlc.sun.com/virtualbox/%{version}/VirtualBox-%{version}-OSE.tar.bz2
Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
-Source3: %{name}.desktop
-Source4: %{name}-90-vboxdrv.rules
-Source5: %{name}.modules
-Source6: %{name}-guest.modules
-Patch6: %{name}-1.6.4-desktop.patch
-Patch7: %{name}-2.0.2-setup.patch
-Patch9: %{name}-2.1.0-icons.patch
-Patch10: %{name}-2.1.0-32bit.patch
-Patch11: %{name}-2.1.2-gcc44.patch
-Patch12: %{name}-2.1.4-swab.patch
-Patch13: %{name}-2.1.4-libcap.patch
+Source4: VirtualBox-OSE-90-vboxdrv.rules
+Source5: VirtualBox-OSE.modules
+Source6: VirtualBox-OSE-guest.modules
+Patch1: VirtualBox-OSE-2.2.0-noupdate.patch
+Patch2: VirtualBox-OSE-2.2.2-strings.patch
+Patch10: VirtualBox-OSE-2.2.0-32bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,11 +36,7 @@
BuildRequires: python-devel
BuildRequires: desktop-file-utils
BuildRequires: libcap-devel
-%if 0%{?fedora} > 6
BuildRequires: qt4-devel
-%else
-BuildRequires: qt-devel < 1:4
-%endif
# Plague-specific weirdness
%if 0%{?fedora} > 10
@@ -55,8 +48,6 @@
Requires: %{name}-kmod = %{version}
Provides: %{name}-kmod-common = %{version}
-Requires(pre): shadow-utils
-
%description
A general-purpose full virtualizer and emulator for 32-bit and
64-bit x86 based PC-compatible machines.
@@ -107,16 +98,9 @@
%setup -q -n VirtualBox-%{version}_OSE
cp %{SOURCE1} . # PDF User Guide
-%patch6 -p1 -b .desktop
-%patch7 -p1 -b .setup
-%patch9 -p1 -b .icons
+%patch1 -p1 -b .noupdates
+%patch2 -p1 -b .strings
%patch10 -p1 -b .32bit
-%patch11 -p1 -b .gcc44
-%patch12 -p1 -b .swab
-%patch13 -p1 -b .libcap
-
-# Copy icons forgotten from distribution, see patch9
-cp src/VBox/Frontends/VirtualBox4/images/os_*.png src/VBox/Frontends/VirtualBox/images
# Remove prebuilt binary tools
rm -rf kBuild
@@ -127,12 +111,8 @@
%build
-./configure --disable-kmods \
-%if 0%{?fedora} > 6
- --disable-qt3
-%else
- --disable-qt4
-%endif
+./configure --disable-kmods --enable-webservice \
+ %{?_without_hardening:--disable-hardening}
. ./env.sh
@@ -145,7 +125,8 @@
# FIXME: Utilize optflags. This will probably involve patching of makefiles
# Setting VBOX_GCC_OPT to optflags doesn't use the flags for large part of
# the tree, while preventing required symbols to be generated in .r0 files
-kmk KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm VBOX_WITH_REGISTRATION_REQUEST= PATH_INS="$PWD/obj"
+kmk KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm VBOX_WITH_REGISTRATION_REQUEST= PATH_INS="$PWD/obj" \
+ KMK_REVISION=3000 KBUILD_KMK_REVISION=3000
%install
@@ -159,11 +140,7 @@
install -d $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox
install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/components
-%if 0%{?fedora} > 6
install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls
-%else
-install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls3
-%endif
install -d $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d $RPM_BUILD_ROOT%{_prefix}/src/%{name}-kmod-%{version}
@@ -174,9 +151,6 @@
ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxManage
ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxSDL
ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VirtualBox
-%if 0%{?fedora} <= 6
-ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VirtualBox3
-%endif
install -p -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
obj/bin/VBoxTunctl \
@@ -188,72 +162,34 @@
# Lib
install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/VBoxDD2.so \
- obj/bin/VBoxDD.so \
- obj/bin/VBoxDDU.so \
- obj/bin/VBoxGuestPropSvc.so \
- obj/bin/VBoxHeadless.so \
- obj/bin/VBoxPython.so \
- obj/bin/VBoxREM.so \
-%ifnarch x86_64
- obj/bin/VBoxREM32.so \
- obj/bin/VBoxREM64.so \
-%endif
- obj/bin/VBoxRT.so \
- obj/bin/VBoxSDL.so \
- obj/bin/VBoxSettings.so \
- obj/bin/VBoxSharedClipboard.so \
- obj/bin/VBoxSharedFolders.so \
- obj/bin/VBoxVMM.so \
- obj/bin/VBoxXPCOM.so \
- obj/bin/VBoxBFE.so \
-%if 0%{?fedora} > 6
- obj/bin/VBoxKeyboard.so \
- obj/bin/VirtualBox.so \
-%else
- obj/bin/VBoxKeyboard3.so \
- obj/bin/VirtualBox3.so \
-%endif
+ obj/bin/*.so \
obj/bin/V*.gc \
obj/bin/V*.r0
-# For some reason this is needed since 2.1.4.
-# Upstream binary distribution doesn't do that
-pushd $RPM_BUILD_ROOT%{_libdir}/virtualbox/components
-ln -sf ../*.so .
-popd
-
# SetUID root binaries
install -p -m 4755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/VBoxHeadless \
obj/bin/VBoxSDL \
-%if 0%{?fedora} > 6
+ obj/bin/VBoxNetDHCP \
+ obj/bin/VBoxNetAdpCtl \
obj/bin/VirtualBox
-%else
- obj/bin/VirtualBox3
-%endif
+
# Other binaries
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/VBoxManage \
obj/bin/VBoxSVC \
- obj/bin/VBoxXPCOMIPCD
+ obj/bin/VBoxXPCOMIPCD \
+ obj/bin/VBoxSysInfo.sh
# Language files
-%if 0%{?fedora} > 6
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \
obj/bin/nls/*
-%else
-install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls3 \
- obj/bin/nls3/*
-%endif
# SDK
cp -rp obj/bin/sdk/. $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk
-install -p -m 0755 -t $RPM_BUILD_ROOT%{_datadir}/virtualbox \
- obj/bin/VBoxSysInfo.sh
-
+# Icon
install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
obj/bin/VBox.png
@@ -289,16 +225,47 @@
%{name}-kmod-%{version}
# Menu entry
-desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+ --remove-key=DocPath --remove-category=X-MandrivaLinux-System \
--vendor='' src/VBox/Installer/linux/VirtualBox.desktop
-%clean
-rm -rf $RPM_BUILD_ROOT
+%check
+# Dear contributor,
+#
+# If you forget a file when updating to a later version, it's
+# not you fault; as you can see, install section is far from
+# ideal. This section is meant to make it easier for you to spot
+# files you've forgotten to include. Feel free to blacklist
+# uninteresting files here.
+#
+# Not sure if a file is "uninteresting"? See if closed version
+# contains it? No? Remove it. Application doesn't run without
+# it? Bring it back.
+
+set +o posix
+diff <((find obj/bin/additions/* -maxdepth 0 -type f \
+ -not -name 'VBoxOGL*.so' \
+ -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%{_datadir}/{pixmaps,applications}/* \
+ -maxdepth 0 -type f \
+ -not -name VBox -exec basename '{}' \; |sort)
+set -o posix
-%pre
-getent group %{groupname} >/dev/null || groupadd -r %{groupname}
+%clean
+rm -rf $RPM_BUILD_ROOT
%files
@@ -310,13 +277,8 @@
%{_bindir}/VBoxSDL
%{_bindir}/VBoxTunctl
%{_bindir}/VirtualBox
-%if 0%{?fedora} <= 6
-%{_bindir}/VirtualBox3
-%endif
%{_libdir}/virtualbox
%{_datadir}/pixmaps/*
-%dir %{_datadir}/virtualbox
-%{_datadir}/virtualbox/VBoxSysInfo.sh
%{_datadir}/applications/*.desktop
%config %{_sysconfdir}/vbox/vbox.cfg
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
@@ -326,7 +288,7 @@
%files devel
%defattr(0644,root,root,-)
-%{_datadir}/virtualbox/sdk
+%{_datadir}/virtualbox
%doc COPYING
@@ -351,6 +313,17 @@
%changelog
+* Sun May 03 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2.2-1
+- Damnit, another new upstream release! :)
+- Improved packaging checks
+- Upstream fixed libcap detection, drop patch
+- Drop gcc44 patch, upstream supports it now
+
+* Sat Apr 25 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2.0-1
+- New upstream release
+- Allow for disabling of hardening to allow group-based vboxdrv control
+- Disable automatic updates
+
* Fri Apr 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.1.4-4
- Adjust architecture list for plague
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 21 Apr 2009 06:26:11 -0000 1.2
+++ sources 3 May 2009 14:24:14 -0000 1.3
@@ -1,2 +1,2 @@
-54548336d61b33e2a01b210b314927cd VirtualBox-2.1.4-3-OSE.tar.bz2
-6d6709fa2a9cb3dfad8c7ad7cd43be32 UserManual.pdf
+82a76247b63e1813695175e7ddf01975 VirtualBox-2.2.2-OSE.tar.bz2
+37573de808ddf2f4e7fe5f46966fbbe6 UserManual.pdf
--- VirtualBox-OSE-1.6.4-desktop.patch DELETED ---
--- VirtualBox-OSE-2.0.2-setup.patch DELETED ---
--- VirtualBox-OSE-2.1.0-32bit.patch DELETED ---
--- VirtualBox-OSE-2.1.0-icons.patch DELETED ---
--- VirtualBox-OSE-2.1.2-gcc44.patch DELETED ---
--- VirtualBox-OSE-2.1.4-libcap.patch DELETED ---
--- VirtualBox-OSE-2.1.4-swab.patch DELETED ---
--- VirtualBox-OSE.desktop DELETED ---
More information about the rpmfusion-commits
mailing list