rpms/VirtualBox-OSE/devel VirtualBox-OSE-3.2.6-vboxkeyboard.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 VirtualBox-OSE.spec, 1.56, 1.57 sources, 1.22, 1.23

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21645

Modified Files:
	.cvsignore VirtualBox-OSE.spec sources 
Added Files:
	VirtualBox-OSE-3.2.6-vboxkeyboard.patch 
Log Message:
* Mon Jul 12 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.6-1
- New release, fix build


VirtualBox-OSE-3.2.6-vboxkeyboard.patch:
 Makefile.kmk |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE VirtualBox-OSE-3.2.6-vboxkeyboard.patch ---
>From 53aff8d4da4230619ecd2c029e2b991dccd2e47b Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 12 Jul 2010 01:52:39 -0400
Subject: [PATCH] Look for VBoxKeyboard files wherever were they created

*_INST causes the files to be created in PATH_INS, not PATH_TARGET. This
fixes a build failure when the two are different.

tar --owner 0 --group 0 --ignore-failed-read -cjRf /br/VirtualBox-3.2.6_OSE/obj/bin/vboxkeyboard.tar.bz2 \
    -C /br/VirtualBox-3.2.6_OSE/out/linux.x86/release/obj/VBoxKeyboard/install VBoxKeyboard
tar: /br/VirtualBox-3.2.6_OSE/out/linux.x86/release/obj/VBoxKeyboard/install: Cannot chdir: No such file or directory
tar: Error is not recoverable: exiting now
---
 .../Frontends/Common/VBoxKeyboard/Makefile.kmk     |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk b/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk
index b88b1c1..9d57e09 100644
--- a/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk
+++ b/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk
@@ -45,12 +45,12 @@ VBoxKeyboard_LIBPATH  = $(VBOX_LIBPATH_X11)
 # but wtf, it's not like we're even trying to be FHS compliant).
 #
 ## @todo this should be tar'ed down into the output directory and installed using an install target.
-VBOX_KEYBOARD_STAGE_DIR = $(PATH_TARGET)/VBoxKeyboard/install
+VBOX_KEYBOARD_STAGE_DIR = $(PATH_INS)/VBoxKeyboard/install
 VBOX_KEYBOARD_DEST_DIR = $(VBOX_KEYBOARD_STAGE_DIR)/VBoxKeyboard/
 
 INSTALLS += VBoxKeyboard-Files
 
-VBoxKeyboard-Files_INST    = $(subst $(PATH_TARGET),obj,$(VBOX_KEYBOARD_DEST_DIR))
+VBoxKeyboard-Files_INST    = $(subst $(PATH_INS)/,,$(VBOX_KEYBOARD_DEST_DIR))
 VBoxKeyboard-Files_MODE    = a+rx,u+w
 VBoxKeyboard-Files_SOURCES = \
 		COPYING.LIB \
-- 
1.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	17 Jun 2010 13:46:54 -0000	1.22
+++ .cvsignore	12 Jul 2010 06:26:13 -0000	1.23
@@ -1,2 +1,2 @@
 UserManual.pdf
-VirtualBox-3.2.4-OSE.tar.bz2
+VirtualBox-3.2.6-OSE.tar.bz2


Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- VirtualBox-OSE.spec	23 Jun 2010 11:55:08 -0000	1.56
+++ VirtualBox-OSE.spec	12 Jul 2010 06:26:13 -0000	1.57
@@ -14,7 +14,7 @@
 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
 
 Name:		VirtualBox-OSE
-Version:	3.2.4
+Version:	3.2.6
 Release:	1%{?prerel:.%{prerel}%{?dist}}
 Summary:	A general-purpose full virtualizer for PC hardware
 
@@ -37,6 +37,7 @@
 Patch11:        VirtualBox-OSE-3.2.0-visibility.patch
 Patch12:	VirtualBox-OSE-3.2.0-noansi.patch
 Patch13:	VirtualBox-OSE-3.2.0-cpuid.patch
+Patch14:	VirtualBox-OSE-3.2.6-vboxkeyboard.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -143,6 +144,7 @@
 %patch11 -p1 -b .visibility
 %patch12 -p1 -b .noansi
 %patch13 -p1 -b .cpuid
+%patch14 -p1 -b .vboxkeyboard
 
 # Remove prebuilt binary tools
 rm -rf kBuild
@@ -168,7 +170,6 @@
 	KMK_REVISION=3000 KBUILD_KMK_REVISION=3000			\
 	VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}"	\
 	VBOX_GCC_R0_OPT="%{optflags}" VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
-	VBOX_KEYBOARD_DEST_DIR="$PWD/obj/obj/VBoxKeyboard/install"
 
 
 %install
@@ -441,6 +442,9 @@
 
 
 %changelog
+* Mon Jul 12 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.6-1
+- New release, fix build
+
 * Thu Jun 17 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.4-1
 - New release
 - Do not use /usr/bin/xargs in module script (Piergiorgio Sartor, #1256)


Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	17 Jun 2010 13:46:58 -0000	1.22
+++ sources	12 Jul 2010 06:26:13 -0000	1.23
@@ -1,2 +1,2 @@
-9c3f21a2011aa4c041f146df90359470  UserManual.pdf
-3ed76bc4048f399dc0465ed0a7f666d8  VirtualBox-3.2.4-OSE.tar.bz2
+8891557360f816f7604d26aac7503489  UserManual.pdf
+65b822ab3c08ff882d9621101996dc14  VirtualBox-3.2.6-OSE.tar.bz2