* VirtualBox: updated to 4.1.2

 * kBuild: updated to 0.1.9998 (svn r2543)


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4649 ec354946-7b23-47d6-9f5a-488ba84defc7

V/VirtualBox/VirtualBox-vl.spec

@@ -1,5 +1,5 @@
-%define version	4.1.0
+%define version	4.1.2
-%define release	2%{?_dist_release}
+%define release	1%{?_dist_release}
 
 %define kname	vboxdrv
 %define oname	VirtualBox
@@ -65,7 +65,7 @@ Patch50:	VirtualBox-4.1.0-fix_kernel_panic_on_shutdown.patch
 
 # vine
 Patch100:	VirtualBox-2.2.2-buildfix.patch
-Patch101:       Virtualbox-4.1.0-vboxpci-build.patch
+Patch101:       VirtualBox-4.1.2-vboxpci-build.patch
 Patch110:	VirtualBox-3.2.4-vine.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -94,7 +94,7 @@ BuildRequires:	gsoap-devel
 BuildRequires:  curl-devel
 BuildRequires:  alsa-lib-devel
 BuildRequires:	dkms
-BuildRequires:  kBuild >= 0.1.5p2
+BuildRequires:  kBuild >= 0.1.999
 BuildRequires:  yasm
 BuildRequires:  qt4-designer
 BuildRequires:  pam-devel
@@ -205,7 +205,7 @@ VirtualBox のゲストシステム用の X.org ビデオドライバです。
 %patch10 -p1 -b .kernel-headers-2.6.29
 %patch12 -p1 -b .disable-update
 %patch18 -p1 -b .mkisofs-makeself
-%patch50 -p1 -b .fix_panic
+#%patch50 -p1 -b .fix_panic
 %patch100 -p1 -b .buildfix
 %patch101 -p1 -b .vboxpci-build
 %patch110 -p1 -b .vine
@@ -242,6 +242,7 @@ echo VBOX_WITHOUT_ADDITIONS=1 >> LocalConfig.kmk
 kmk KBUILD_VERBOSE=2 \
     TOOL_YASM_AS=yasm \
     VBOX_WITH_REGISTRATION_REQUEST= \
+    VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_VINE \
     %{?_smp_mflags} all
 
 %install
@@ -550,6 +551,12 @@ set -x
 
 
 %changelog
+* Wed Aug 24 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 4.1.2-1
+- new upstream release
+- drop Patch50; fix Patch12 & Patch101
+- specify VBOX_VERSION_STRING on kmk to declare third-party (VINE) build
+  see: http://www.virtualbox.org/wiki/Editions
+
 * Tue Aug  9 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 4.1.0-2
 - add Patch50 to fix random kernel panic during shutdown on some environments
   (see: http://www.virtualbox.org/ticket/9305)

k/kBuild/kBuild-vl.spec

@@ -1,18 +1,20 @@
-%define origver 0.1.5-p2
+%define origver 0.1.9998
+%define svnrev 2543
 
 Summary:        A cross-platform build environment
 Summary(ja):    クロスプラットフォームビルド環境
 
 Name:           kBuild
-Version:        0.1.5p2
+Version:        0.1.9998
-Release:        1%{?_dist_release}
+Release:        1.svn%{svnrev}%{?_dist_release}
 
 Group:          Development/Tools
 License:        BSD and GPLv2+
 # most tools are from NetBSD, some are from FreeBSD,
 # and make and sed are from GNU
 URL:            http://svn.netlabs.org/kbuild
-Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{origver}-src.tar.gz
+#Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{origver}-src.tar.gz
+Source0:        kBuild-0.1.9998.svn%{svnrev}.tar.gz
 Patch0:         kBuild-0.1.3-escape.patch
 Patch1:         kBuild-0.1.5-dprintf.patch
 Patch2:         kBuild-0.1.5-pthread.patch
@@ -32,7 +34,7 @@ repository.
 
 
 %prep
-%setup -q -n %{name}-%{origver}
+%setup -q -n %{name}-%{origver}.svn%{svnrev}
 %patch0 -p1 -b .escape
 %patch1 -p1 -b .dprintf
 %patch2 -p1 -b .pthreads
@@ -81,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 24 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 0.1.9998-1.svn2543
+- updated to 0.1.9998 (svn rev 2543)
+
 * Sun Apr 18 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.1.5p2-1
 - update to 0.1.5-p2
 - add patch2 to fix build