|
|
@@ -1,4 +1,4 @@
|
|
|
-%define version 4.1.18
|
|
|
+%define version 4.2.0
|
|
|
%define release 1%{?_dist_release}
|
|
|
|
|
|
%define kname vboxdrv
|
|
|
@@ -101,14 +101,19 @@ BuildRequires: gsoap-devel
|
|
|
BuildRequires: curl-devel
|
|
|
BuildRequires: alsa-lib-devel
|
|
|
BuildRequires: dkms
|
|
|
-BuildRequires: kBuild >= 0.1.999
|
|
|
+#BuildRequires: kBuild >= 0.1.999
|
|
|
BuildRequires: yasm
|
|
|
BuildRequires: qt4-designer
|
|
|
BuildRequires: pam-devel
|
|
|
%ifarch x86_64
|
|
|
BuildRequires: compat32-glibc-devel
|
|
|
%endif
|
|
|
+%if %{?_dist_release} >= "vl7"
|
|
|
+BuildRequires: java-1.7.0-openjdk-devel
|
|
|
+%else
|
|
|
BuildRequires: java-1.6.0-openjdk-devel
|
|
|
+%endif
|
|
|
+
|
|
|
%if %{build_doc}
|
|
|
BuildRequires: task-texlive
|
|
|
BuildRequires: texlive-collection-fontsextra
|
|
|
@@ -221,7 +226,7 @@ VirtualBox のゲストシステム用の X.org ビデオドライバです。
|
|
|
%patch110 -p1 -b .vine
|
|
|
|
|
|
# remove prebuilt binaries
|
|
|
-rm -rf kBuild tools
|
|
|
+# rm -rf kBuild tools
|
|
|
|
|
|
cat << EOF > LocalConfig.kmk
|
|
|
VBOX_PATH_APP_PRIVATE_ARCH:=%{vboxlibdir}
|
|
|
@@ -565,6 +570,10 @@ set -x
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Sep 14 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 4.2.0-1
|
|
|
+- new upstream release
|
|
|
+- temporarily use internal kBuild to fix build failure
|
|
|
+
|
|
|
* Sat Jun 22 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 4.1.18-1
|
|
|
- new upstream release
|
|
|
|
shaolin