rpms/VirtualBox-OSE/F-11 VirtualBox-OSE-3.0.0-netfreeze.patch, NONE, 1.1 VirtualBox-OSE-3.0.0-strings.patch, NONE, 1.1 VirtualBox-OSE-60-vboxadd.rules, NONE, 1.1 VirtualBox-OSE-vboxresize.desktop, NONE, 1.1 .cvsignore, 1.4, 1.5 VirtualBox-OSE.spec, 1.6, 1.7 sources, 1.4, 1.5 VirtualBox-OSE-2.2.2-strings.patch, 1.1, NONE

Lubomir Rintel lkundrak at rpmfusion.org
Fri Jul 10 15:53:59 CEST 2009


Author: lkundrak

Update of /cvs/free/rpms/VirtualBox-OSE/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12063

Modified Files:
	.cvsignore VirtualBox-OSE.spec sources 
Added Files:
	VirtualBox-OSE-3.0.0-netfreeze.patch 
	VirtualBox-OSE-3.0.0-strings.patch 
	VirtualBox-OSE-60-vboxadd.rules 
	VirtualBox-OSE-vboxresize.desktop 
Removed Files:
	VirtualBox-OSE-2.2.2-strings.patch 
Log Message:
Merge 3.0.0 from devel

VirtualBox-OSE-3.0.0-netfreeze.patch:

--- NEW FILE VirtualBox-OSE-3.0.0-netfreeze.patch ---
r21126 | vboxsync | 2009-07-01 16:11:27 +0200 (Wed, 01 Jul 2009) | 2 lines
PDMR3QueueFlushAll: The bit number, not the mask.

r21128 | vboxsync | 2009-07-01 16:46:19 +0200 (Wed, 01 Jul 2009) | 1 line
PDMQueue: Fixed the flushing loop when a consumer (NAT?) had had enough.

r21151 | vboxsync | 2009-07-02 13:47:24 +0200 (Thu, 02 Jul 2009) | 1 line
PDMQueue: Fixed leaking the last pending item when the consume returned false. Also, be more paranoid whe returning unconsumed items to the pending list.

r21153 | vboxsync | 2009-07-02 13:50:23 +0200 (Thu, 02 Jul 2009) | 1 line
PDMQueue: tyop.

diff -up VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMInternal.h.netfreeze VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMInternal.h
--- VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMInternal.h.netfreeze	2009-06-30 12:21:58.000000000 +0200
+++ VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMInternal.h	2009-07-10 14:57:54.000000000 +0200
@@ -723,6 +723,21 @@ typedef struct PDMQUEUE
     }                               aFreeItems[1];
 } PDMQUEUE;
 
+/** @name PDM::fQueueFlushing
+ * @{ */
+/** Indicating that an queue insert has been performed. */
+#define PDM_QUEUE_FLUSH_FLAG_ACTIVE         RT_BIT_32(PDM_QUEUE_FLUSH_FLAG_ACTIVE_BIT)
+/** The bit number for PDM_QUEUE_FLUSH_FLAG_ACTIVE_BIT.  */
+#define PDM_QUEUE_FLUSH_FLAG_ACTIVE_BIT     0
+/** Indicating there are pending items.
+ * This is make sure we don't miss inserts happening during flushing. The FF
+ * cannot be used for this since it has to be cleared immediately to prevent
+ * other EMTs from spinning. */
+#define PDM_QUEUE_FLUSH_FLAG_PENDING        RT_BIT_32(PDM_QUEUE_FLUSH_FLAG_PENDING_BIT)
+/** The bit number for PDM_QUEUE_FLUSH_FLAG_PENDING.  */
+#define PDM_QUEUE_FLUSH_FLAG_PENDING_BIT    1
+/** }@  */
+
 
 /**
  * Queue device helper task operation.
@@ -887,8 +902,9 @@ typedef struct PDM
     /** Pointer to the queue which should be manually flushed - RC Ptr.
      * Only touched by EMT. */
     RCPTRTYPE(struct PDMQUEUE *)    pQueueFlushRC;
-    /** Set if we're currently checking queues to prevent other VCPUs from doing the same concurrently. */
-    volatile uint32_t               fQueueFlushing;
+    /** Bitmask controlling the queue flushing.
+     * See PDM_QUEUE_FLUSH_FLAG_ACTIVE and PDM_QUEUE_FLUSH_FLAG_PENDING. */
+    uint32_t volatile               fQueueFlushing;
 
     /** Head of the PDM Thread list. (singly linked) */
     R3PTRTYPE(PPDMTHREAD)           pThreads;
diff -up VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMQueue.cpp.netfreeze VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMQueue.cpp
--- VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMQueue.cpp.netfreeze	2009-07-10 14:57:54.117409044 +0200
+++ VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMQueue.cpp	2009-07-10 14:57:54.000000000 +0200
@@ -672,7 +672,7 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
     if (    !pItems
         &&  !pItemsRC
         &&  !pItemsR0)
-        /* Somebody was racing us. */
+        /* Somebody may be racing us ... never mind. */
         return true;
 
     /*
@@ -721,10 +721,10 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
         case PDMQUEUETYPE_DEV:
             while (pItems)
             {
+                if (!pQueue->u.Dev.pfnCallback(pQueue->u.Dev.pDevIns, pItems))
+                    break;
                 pCur = pItems;
                 pItems = pItems->pNextR3;
-                if (!pQueue->u.Dev.pfnCallback(pQueue->u.Dev.pDevIns, pCur))
-                    break;
                 pdmR3QueueFree(pQueue, pCur);
             }
             break;
@@ -732,10 +732,10 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
         case PDMQUEUETYPE_DRV:
             while (pItems)
             {
+                if (!pQueue->u.Drv.pfnCallback(pQueue->u.Drv.pDrvIns, pItems))
+                    break;
                 pCur = pItems;
                 pItems = pItems->pNextR3;
-                if (!pQueue->u.Drv.pfnCallback(pQueue->u.Drv.pDrvIns, pCur))
-                    break;
                 pdmR3QueueFree(pQueue, pCur);
             }
             break;
@@ -743,10 +743,10 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
         case PDMQUEUETYPE_INTERNAL:
             while (pItems)
             {
+                if (!pQueue->u.Int.pfnCallback(pQueue->pVMR3, pItems))
+                    break;
                 pCur = pItems;
                 pItems = pItems->pNextR3;
-                if (!pQueue->u.Int.pfnCallback(pQueue->pVMR3, pCur))
-                    break;
                 pdmR3QueueFree(pQueue, pCur);
             }
             break;
@@ -754,10 +754,10 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
         case PDMQUEUETYPE_EXTERNAL:
             while (pItems)
             {
+                if (!pQueue->u.Ext.pfnCallback(pQueue->u.Ext.pvUser, pItems))
+                    break;
                 pCur = pItems;
                 pItems = pItems->pNextR3;
-                if (!pQueue->u.Ext.pfnCallback(pQueue->u.Ext.pvUser, pCur))
-                    break;
                 pdmR3QueueFree(pQueue, pCur);
             }
             break;
@@ -773,30 +773,34 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
     if (pItems)
     {
         /*
-         * Shit, no!
-         *      1. Insert pCur.
-         *      2. Reverse the list.
-         *      3. Insert the LIFO at the tail of the pending list.
+         * Reverse the list.
          */
-        pCur->pNextR3 = pItems;
-        pItems = pCur;
-
-        //pCur = pItems;
+        pCur = pItems;
         pItems = NULL;
         while (pCur)
         {
             PPDMQUEUEITEMCORE pInsert = pCur;
-            pCur = pCur->pNextR3;
+            pCur = pInsert->pNextR3;
             pInsert->pNextR3 = pItems;
             pItems = pInsert;
         }
 
-        if (!ASMAtomicCmpXchgPtr((void * volatile *)&pQueue->pPendingR3, pItems, NULL))
+        /*
+         * Insert the list at the tail of the pending list.
+         */
+        for (;;)
         {
-            pCur = pQueue->pPendingR3;
-            while (pCur->pNextR3)
-                pCur = pCur->pNextR3;
-            pCur->pNextR3 = pItems;
+            if (ASMAtomicCmpXchgPtr((void * volatile *)&pQueue->pPendingR3, pItems, NULL))
+                break;
+            PPDMQUEUEITEMCORE pPending = (PPDMQUEUEITEMCORE)ASMAtomicXchgPtr((void * volatile *)&pQueue->pPendingR3, NULL);
+            if (pPending)
+            {
+                pCur = pPending;
+                while (pCur->pNextR3)
+                    pCur = pCur->pNextR3;
+                pCur->pNextR3 = pItems;
+                pItems = pPending;
+            }
         }
         return false;
     }
diff -up VirtualBox-3.0.0_OSE/src/VBox/VMM/VMMAll/PDMAllQueue.cpp.netfreeze VirtualBox-3.0.0_OSE/src/VBox/VMM/VMMAll/PDMAllQueue.cpp
--- VirtualBox-3.0.0_OSE/src/VBox/VMM/VMMAll/PDMAllQueue.cpp.netfreeze	2009-06-24 15:38:13.114408205 +0200
+++ VirtualBox-3.0.0_OSE/src/VBox/VMM/VMMAll/PDMAllQueue.cpp	2009-07-10 14:57:54.000000000 +0200
@@ -91,6 +91,7 @@ VMMDECL(void) PDMQueueInsert(PPDMQUEUE p
         PVM pVM = pQueue->CTX_SUFF(pVM);
         Log2(("PDMQueueInsert: VM_FF_PDM_QUEUES %d -> 1\n", VM_FF_ISSET(pVM, VM_FF_PDM_QUEUES)));
         VM_FF_SET(pVM, VM_FF_PDM_QUEUES);
+        ASMAtomicBitSet(&pVM->pdm.s.fQueueFlushing, PDM_QUEUE_FLUSH_FLAG_PENDING_BIT);
 #ifdef IN_RING3
         REMR3NotifyQueuePending(pVM); /** @todo r=bird: we can remove REMR3NotifyQueuePending and let VMR3NotifyFF do the work. */
         VMR3NotifyGlobalFFU(pVM->pUVM, VMNOTIFYFF_FLAGS_DONE_REM);

VirtualBox-OSE-3.0.0-strings.patch:

--- NEW FILE VirtualBox-OSE-3.0.0-strings.patch ---
Replace some strings which ones that (sometimes) make more sense.

Lubomir Rintel <lkundrak at v3.sk>


diff -urb VirtualBox-3.0.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-3.0.0_OSEb/src/VBox/Frontends/VirtualBox/src/main.cpp
--- VirtualBox-3.0.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2009-06-24 16:38:16.000000000 +0300
+++ VirtualBox-3.0.0_OSEb/src/VBox/Frontends/VirtualBox/src/main.cpp	2009-07-03 14:14:27.528519750 +0300
@@ -72,13 +72,13 @@
   );
 
 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_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -101,9 +101,9 @@
   "Make sure the kernel module has been loaded successfully."
   );
 
-/* 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 report the problem to the RPM Fusion Bugzilla."
   );
 
 #if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
diff -urb VirtualBox-3.0.0_OSE/src/VBox/Installer/linux/VBox.sh VirtualBox-3.0.0_OSEb/src/VBox/Installer/linux/VBox.sh
--- VirtualBox-3.0.0_OSE/src/VBox/Installer/linux/VBox.sh	2009-03-27 21:13:57.000000000 +0200
+++ VirtualBox-3.0.0_OSEb/src/VBox/Installer/linux/VBox.sh	2009-07-03 14:12:02.490521356 +0300
@@ -36,19 +36,20 @@
     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 -urb VirtualBox-3.0.0_OSE/src/VBox/Installer/linux/VirtualBox.desktop VirtualBox-3.0.0_OSEb/src/VBox/Installer/linux/VirtualBox.desktop
--- VirtualBox-3.0.0_OSE/src/VBox/Installer/linux/VirtualBox.desktop	2009-06-12 15:34:41.000000000 +0300
+++ VirtualBox-3.0.0_OSEb/src/VBox/Installer/linux/VirtualBox.desktop	2009-07-03 14:12:02.492525812 +0300
@@ -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 -urb VirtualBox-3.0.0_OSE/src/VBox/VMM/VM.cpp VirtualBox-3.0.0_OSEb/src/VBox/VMM/VM.cpp
--- VirtualBox-3.0.0_OSE/src/VBox/VMM/VM.cpp	2009-06-24 16:38:14.000000000 +0300
+++ VirtualBox-3.0.0_OSEb/src/VBox/VMM/VM.cpp	2009-07-03 14:12:02.501771542 +0300
@@ -314,8 +314,8 @@
 #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
@@ -356,8 +356,8 @@
 #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


--- NEW FILE VirtualBox-OSE-60-vboxadd.rules ---
ACTION=="add", KERNEL=="vboxadd", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"


--- NEW FILE VirtualBox-OSE-vboxresize.desktop ---
[Desktop Entry]
Type=Application
Version=1.0
Name=vbox-autoresize
Exec=/usr/bin/VBoxClient --autoresize
X-GNOME-Autostart-enabled=true


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Jun 2009 21:52:06 -0000	1.4
+++ .cvsignore	10 Jul 2009 13:53:59 -0000	1.5
@@ -1,2 +1,2 @@
-VirtualBox-2.2.4-OSE.tar.bz2
+VirtualBox-3.0.0-OSE.tar.bz2
 UserManual.pdf


Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/VirtualBox-OSE.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VirtualBox-OSE.spec	29 Jun 2009 04:01:12 -0000	1.6
+++ VirtualBox-OSE.spec	10 Jul 2009 13:53:59 -0000	1.7
@@ -9,8 +9,8 @@
 %bcond_without hardening
 
 Name:           VirtualBox-OSE
-Version:        2.2.4
-Release:        2%{?dist}.1
+Version:        3.0.0
+Release:        3%{?dist}
 Summary:        A general-purpose full virtualizer for PC hardware
 
 Group:          Development/Tools
@@ -19,16 +19,22 @@
 Source0:        http://dlc.sun.com/virtualbox/%{version}/VirtualBox-%{version}-OSE.tar.bz2
 Source1:        http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
 Source4:        VirtualBox-OSE-90-vboxdrv.rules
-Source5:        VirtualBox-OSE.modules
-Source6:        VirtualBox-OSE-guest.modules
+Source5:        VirtualBox-OSE-60-vboxadd.rules
+Source6:        VirtualBox-OSE.modules
+Source7:        VirtualBox-OSE-guest.modules
+Source8:        VirtualBox-OSE-vboxresize.desktop
 Patch1:         VirtualBox-OSE-2.2.0-noupdate.patch
-Patch2:         VirtualBox-OSE-2.2.2-strings.patch
+Patch2:         VirtualBox-OSE-3.0.0-strings.patch
+Patch3:         VirtualBox-OSE-3.0.0-netfreeze.patch
 Patch10:        VirtualBox-OSE-2.2.0-32bit.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kBuild >= 0.1.5-1
-BuildRequires:  SDL-devel xalan-c-devel hal-devel
+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
@@ -95,6 +101,7 @@
 
 %patch1 -p1 -b .noupdates
 %patch2 -p1 -b .strings
+%patch3 -p1 -b .netfreeze
 %patch10 -p1 -b .32bit
 
 # Remove prebuilt binary tools
@@ -156,8 +163,10 @@
         obj/bin/components/*
 
 # Lib
+install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
+        obj/bin/*.so
+
 install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
-        obj/bin/*.so            \
         obj/bin/V*.gc           \
         obj/bin/V*.r0
 
@@ -169,13 +178,14 @@
         obj/bin/VBoxNetAdpCtl   \
         obj/bin/VirtualBox
 
-
 # Other binaries
 install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
         obj/bin/VBoxManage      \
         obj/bin/VBoxSVC         \
         obj/bin/VBoxXPCOMIPCD   \
-        obj/bin/VBoxSysInfo.sh
+        obj/bin/VBoxSysInfo.sh  \
+        obj/bin/vboxshell.py    \
+        obj/bin/VBoxTestOGL
 
 # Language files
 install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \
@@ -204,7 +214,7 @@
 # Guest tools
 install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} 	\
         obj/bin/additions/mountvboxsf           \
-        obj/bin/additions/vboxadd-timesync      \
+        obj/bin/additions/VBoxService           \
         obj/bin/additions/VBoxClient            \
         obj/bin/additions/VBoxControl
 
@@ -213,7 +223,12 @@
 
 install -m 0755 -D src/VBox/Additions/x11/Installer/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
+
 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} 	\
@@ -223,12 +238,13 @@
 install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vbox
 echo 'INSTALL_DIR="%{_libdir}/virtualbox"' > $RPM_BUILD_ROOT/%{_sysconfdir}/vbox/vbox.cfg
 
-# Install udev rule
+# Install udev rules
 install -p -m 0644 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
+install -p -m 0644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-vboxadd.rules
 
 # Install modules load script
-install -p -m 0755 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}.modules
-install -p -m 0755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
+install -p -m 0755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}.modules
+install -p -m 0755 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
 
 # Module Source Code
 mkdir -p %{name}-kmod-%{version}
@@ -273,6 +289,7 @@
                 $RPM_BUILD_ROOT%{_libdir}/*OGL*.so      \
                 $RPM_BUILD_ROOT%{_datadir}/{pixmaps,applications}/* \
                 -maxdepth 0 -type f                     \
+                -not -name '*.py[co]'                   \
                 -not -name VBox -exec basename '{}' \; |sort)
 set -o posix
 
@@ -301,7 +318,7 @@
 %config %{_sysconfdir}/vbox/vbox.cfg
 %config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
 %config %{_sysconfdir}/sysconfig/modules/%{name}.modules
-%doc COPYING
+%doc COPYING UserManual.pdf
 
 
 %files devel
@@ -313,14 +330,16 @@
 %files guest
 %defattr(-,root,root,-)
 %{_bindir}/mountvboxsf
-%{_bindir}/vboxadd-timesync
 %{_bindir}/VBoxClient
 %{_bindir}/VBoxControl
+%{_bindir}/VBoxService
 %{_libdir}/xorg/modules/drivers/*
 %{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
 %{_sysconfdir}/xdg/autostart/vboxclient.desktop
+%{_datadir}/gdm/autostart/LoginWindow
 %{_libdir}/VBoxOGL*.so
 %{_datadir}/hal/fdi/information/20thirdparty/90-vboxguest.fdi
+%config %{_sysconfdir}/udev/rules.d/60-vboxadd.rules
 %config %{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
 %doc COPYING
 
@@ -331,11 +350,23 @@
 
 
 %changelog
-* Mon Jun 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2.4-2.1
-- FFFUUU- I somehow managed to make tag in devel tree; bumping
+* Fri Jul 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.0-3
+- Fix freeze of guests on network load (upstream ticket/4343)
+
+* Wed Jul 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.0-2
+- Tidy up the filelist check
+- Libs need to be executable for the dep generator (#698)
+
+* Fri Jul 03 2009 Jonathan Dieter <jdieter at gmail.com> - 3.0.0-1
+- New upstream release
+
+* Thu Jul 02 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2.4-3
+- Enable resize for the login window
+- Add the guest udev rules
+- Actually install documentation
 
 * Mon Jun 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2.4-2
-- They left for beer too early, dicks, so we fix up vbox now
+- They left for beer too early, dicks, so we fix up wbox now
 - Make guest additions just work
 - Merge xorg stuff with rest of guest additions
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Jun 2009 21:52:06 -0000	1.4
+++ sources	10 Jul 2009 13:53:59 -0000	1.5
@@ -1,2 +1,2 @@
-b90176e3878ccfef2991322b2248dcb0  VirtualBox-2.2.4-OSE.tar.bz2
-1f8ec67c1dbc0bcdfbbfbe26171eb098  UserManual.pdf
+d1560d8b0a766236161eeb659e802b5a  VirtualBox-3.0.0-OSE.tar.bz2
+e62fce82380b3368e2558a663715734c  UserManual.pdf


--- VirtualBox-OSE-2.2.2-strings.patch DELETED ---



More information about the rpmfusion-commits mailing list