|
|
@@ -1,9 +1,9 @@
|
|
|
-%define version 3.2.12
|
|
|
-%define release 3%{?_dist_release}
|
|
|
+%define version 4.0.6
|
|
|
+%define release 1%{?_dist_release}
|
|
|
|
|
|
%define kname vboxdrv
|
|
|
%define oname VirtualBox
|
|
|
-%define srcname %{oname}-%{version}-OSE
|
|
|
+%define srcname %{oname}-%{version}
|
|
|
%define distname %{oname}-%{version}_OSE
|
|
|
%define dirname vbox-ose
|
|
|
%define pkgver %{version}
|
|
|
@@ -12,6 +12,7 @@
|
|
|
%define vboxdatadir %{_datadir}/%{name}
|
|
|
|
|
|
%define build_additions 1
|
|
|
+%define build_doc 0
|
|
|
|
|
|
%ifarch %{ix86}
|
|
|
%define vbox_platform linux.x86
|
|
|
@@ -38,7 +39,7 @@ Source2: virtualbox.init.vine
|
|
|
Source3: vboxadd-timesync.vine
|
|
|
Source4: 60-vboxadd.perms
|
|
|
Source10: VirtualBox.png
|
|
|
-Patch2: VirtualBox-1.5.6_OSE-kernelrelease.patch
|
|
|
+Patch2: VirtualBox-4.0.6-kernelrelease.patch
|
|
|
Patch4: VirtualBox-1.6.0_OSE-futex.patch
|
|
|
Patch5: virtualbox-fix-vboxadd-req.patch
|
|
|
# (fc) 1.6.0-2mdv fix initscript name in VBox.sh script
|
|
|
@@ -47,6 +48,10 @@ Patch6: VirtualBox-1.6.0_OSE-initscriptname.patch
|
|
|
Patch10: VirtualBox-kernel-headers-2.6.29.patch
|
|
|
# (fc) 2.2.0-1mdv disable update notification (Debian)
|
|
|
Patch12: 16-no-update.patch
|
|
|
+# don't check for:
|
|
|
+# mkisofs: we're not going to build the additions .iso file
|
|
|
+# makeself: we're not going to create the stanalone .run installers
|
|
|
+Patch18: virtualbox-4.0.0-dont-check-for-mkisofs-or-makeself.patch
|
|
|
|
|
|
# vine
|
|
|
Patch100: VirtualBox-2.2.2-buildfix.patch
|
|
|
@@ -85,6 +90,11 @@ BuildRequires: pam-devel
|
|
|
%ifarch x86_64
|
|
|
BuildRequires: compat32-glibc-devel
|
|
|
%endif
|
|
|
+BuildRequires: java-1.6.0-openjdk-devel
|
|
|
+%if %{build_doc}
|
|
|
+BuildRequires: task-texlive
|
|
|
+BuildRequires: texlive-collection-fontsextra
|
|
|
+%endif
|
|
|
|
|
|
%description
|
|
|
VirtualBox Open Source Edition (OSE) is a general-purpose full
|
|
|
@@ -183,6 +193,7 @@ VirtualBox のゲストシステム用の X.org ビデオドライバです。
|
|
|
%patch6 -p1 -b .initscriptname
|
|
|
%patch10 -p1 -b .kernel-headers-2.6.29
|
|
|
%patch12 -p1 -b .disable-update
|
|
|
+%patch18 -p1 -b .mkisofs-makeself
|
|
|
%patch100 -p1 -b .buildfix
|
|
|
%patch110 -p1 -b .vine
|
|
|
|
|
|
@@ -196,10 +207,18 @@ VBOX_WITH_RUNPATH:=%{vboxlibdir}
|
|
|
VBOX_PATH_APP_PRIVATE:=%{vboxdatadir}
|
|
|
VBOX_WITH_TESTCASES:=
|
|
|
VBOX_WITH_TESTSUITE:=
|
|
|
+VBOX_JAVA_HOME := %{_prefix}/lib/jvm/java-openjdk/
|
|
|
+VBOX_WITHOUT_ADDITIONS_ISO := 1
|
|
|
EOF
|
|
|
|
|
|
%build
|
|
|
-./configure --disable-kmods --with-linux=$PWD/fake-linux
|
|
|
+
|
|
|
+./configure \
|
|
|
+ --with-linux=$PWD/fake-linux \
|
|
|
+ --disable-kmods \
|
|
|
+%if ! %{build_doc}
|
|
|
+ --disable-docs
|
|
|
+%endif
|
|
|
|
|
|
%if !%{build_additions}
|
|
|
sed -rie 's/(VBOX_WITH_LINUX_ADDITIONS\s+:=\s+).*/\1/' AutoConfig.kmk
|
|
|
@@ -283,20 +302,22 @@ cat > %{buildroot}%{_sysconfdir}/udev/rules.d/%{name}.rules << EOF
|
|
|
KERNEL=="%{kname}", MODE="0666"
|
|
|
EOF
|
|
|
cat > %{buildroot}%{_sysconfdir}/udev/rules.d/vbox-additions.rules << EOF
|
|
|
-KERNEL=="vboxguest|vboxuser", ENV{ACL_MANAGE}="1"
|
|
|
+KERNEL=="vboxguest", NAME="vboxguest", OWNER="root", MODE="0660"
|
|
|
+KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", MODE="0666"
|
|
|
EOF
|
|
|
|
|
|
# install additions
|
|
|
%if %{build_additions}
|
|
|
mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty
|
|
|
-#install -m755 src/VBox/Additions/linux/installer/vboxadd-service.sh %{buildroot}%{_initrddir}/vboxadd-timesync
|
|
|
install -m755 %SOURCE3 %{buildroot}%{_initrddir}/vboxadd-timesync
|
|
|
-#install -m755 src/VBox/Additions/x11/Installer/VBoxRandR.sh %{buildroot}%{_bindir}/VBoxRandR
|
|
|
-install -m755 src/VBox/Additions/linux/installer/90-vboxguest.fdi %{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
|
|
|
-mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d/
|
|
|
-install -m755 src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules %{buildroot}%{_sysconfdir}/udev/rules.d/
|
|
|
-mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
|
|
|
-install -m755 src/VBox/Additions/x11/Installer/50-vboxmouse.conf %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
|
|
|
+
|
|
|
+%if %{_dist_release} < vl6
|
|
|
+install -m644 src/VBox/Additions/linux/installer/90-vboxguest.fdi %{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
|
|
|
+%endif
|
|
|
+install -d %{buildroot}%{_sysconfdir}/udev/rules.d/
|
|
|
+install -m644 src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules %{buildroot}%{_sysconfdir}/udev/rules.d/
|
|
|
+install -d %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
|
|
|
+install -m644 src/VBox/Additions/x11/Installer/50-vboxmouse.conf %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
|
|
|
|
|
|
install -d %{buildroot}%{_sysconfdir}/X11/xinit.d
|
|
|
install -m755 src/VBox/Additions/x11/Installer/98vboxadd-xclient %{buildroot}%{_sysconfdir}/X11/xinit.d
|
|
|
@@ -498,7 +519,9 @@ set -x
|
|
|
%{_libdir}/xorg/modules/input/vboxmouse_drv.so
|
|
|
%{_sysconfdir}/X11/xorg.conf.d/*.conf
|
|
|
%{_sysconfdir}/udev/rules.d/*.rules
|
|
|
+%if %{_dist_release} < vl6
|
|
|
%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
|
|
|
+%endif
|
|
|
|
|
|
%files -n xorg-x11-drv-vboxvideo
|
|
|
%defattr(-,root,root)
|
|
|
@@ -514,6 +537,10 @@ set -x
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri May 13 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 4.0.6-1
|
|
|
+- update to 4.0.6
|
|
|
+- add BR: java-1.6.0-openjdk-devel
|
|
|
+
|
|
|
* Fri Jan 14 2011 Shu KONNO <owa@bg.wakwak.com> 3.2.12-3
|
|
|
- rebuilt with openssl-1.0.0c
|
|
|
- added vboxadd-timesync.vine instead of vboxadd-service.sh
|
daisuke