Author: glen Date: Tue Nov 17 14:42:27 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- install mountvboxsf as /sbin/mount.vboxsf and move it to vboxvfs kernel
package
- adapter, desc cosmetics; rel 4
---- Files affected:
packages/VirtualBox:
VirtualBox.spec (1.234 -> 1.235)
---- Diffs:
================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.234
packages/VirtualBox/VirtualBox.spec:1.235
--- packages/VirtualBox/VirtualBox.spec:1.234 Tue Nov 17 15:21:10 2009
+++ packages/VirtualBox/VirtualBox.spec Tue Nov 17 15:42:21 2009
@@ -24,7 +24,7 @@
%define _enable_debug_packages 0
%endif
-%define rel 3
+%define rel 4
%define pname VirtualBox
Summary: VirtualBox OSE - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox OSE - wirtualizator sprzętu x86
@@ -78,6 +78,7 @@
BuildRequires: curl-devel
BuildRequires: gcc >= 5:3.2.3
BuildRequires: libIDL-devel
+BuildRequires: libcap-static
BuildRequires: libpng-devel >= 1.2.5
BuildRequires: libstdc++-devel >= 5:3.2.3
BuildRequires: libstdc++-static >= 5:3.2.3
@@ -95,9 +96,7 @@
BuildRequires: which
BuildRequires: xalan-c-devel >= 1.10.0
BuildRequires: xerces-c-devel >= 2.6.0
-BuildRequires: libxml2-devel >= 2.6.26
BuildRequires: zlib-devel >= 1.2.1
-BuildRequires: libcap-static
%endif
%if %{with dist_kernel}
BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20
@@ -116,6 +115,7 @@
%else
%define outdir x86
%endif
+%define _sbindir /sbin
%description
InnoTek VirtualBox OSE is a general-purpose full virtualizer for x86
@@ -280,9 +280,9 @@
Summary(pl.UTF-8): Sterownik myszy dla systemu gościa w VirtualBoksie OSE
Release: %{rel}
Group: X11/Applications
-Requires: xorg-xserver-server(xinput-abi) >= 4.0
-Requires: xorg-xserver-server(xinput-abi) < 5.0
Requires: xorg-xserver-server >= 1.0.99.901
+Requires: xorg-xserver-server(xinput-abi) < 5.0
+Requires: xorg-xserver-server(xinput-abi) >= 4.0
%description -n xorg-driver-input-vboxmouse
X.org mouse driver for VirtualBox OSE guest OS.
@@ -295,9 +295,9 @@
Summary(pl.UTF-8): Sterownik grafiki dla systemu gościa w VirtualBoksie OSE
Release: %{rel}
Group: X11/Applications
+Requires: xorg-xserver-server >= 1.0.99.901
Requires: xorg-xserver-server(videodrv-abi) < 6.0
Requires: xorg-xserver-server(videodrv-abi) >= 2.0
-Requires: xorg-xserver-server >= 1.0.99.901
%description -n xorg-driver-video-vboxvideo
X.org video driver for VirtualBox OSE guest OS.
@@ -384,8 +384,9 @@
cp -a out/linux.%{outdir}/release/bin/components
$RPM_BUILD_ROOT%{_libdir}/VirtualBox
cp -a out/linux.%{outdir}/release/bin/nls/*
$RPM_BUILD_ROOT%{_libdir}/VirtualBox/nls
+install -d $RPM_BUILD_ROOT%{_sbindir}
install -p out/linux.%{outdir}/release/bin/additions/mountvboxsf
\
- $RPM_BUILD_ROOT%{_bindir}
+ $RPM_BUILD_ROOT%{_sbindir}/mount.vboxsf
install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
@@ -412,6 +413,8 @@
%install_kernel_modules -m PLD-MODULE-BUILD/vboxnetflt/vboxnetflt -d misc
%install_kernel_modules -m PLD-MODULE-BUILD/vboxvfs/vboxvfs -d misc
%install_kernel_modules -m PLD-MODULE-BUILD/vboxvideo_drm/vboxvideo -d misc
+
+install -d $RPM_BUILD_ROOT/etc/modprobe.d
cat <<'EOF' > $RPM_BUILD_ROOT/etc/modprobe.d/vboxvfs.conf
# Somewhy filesystem is not called as same as kernel module.
alias vboxsf vboxvfs
@@ -432,7 +435,7 @@
Additionally you might want to install:
kernel-misc-vboxnetflt-%{version}-%{r...@%{_kernel_ver_str}
-On guest Linux system you might want to install:
+On Guest Linux system you might want to install:
kernel-misc-vboxadd-%{version}-%{r...@%{_kernel_ver_str}
kernel-misc-vboxvfs-%{version}-%{r...@%{_kernel_ver_str}
kernel-misc-vboxvideo-%{version}-%{r...@%{_kernel_ver_str}
@@ -455,7 +458,7 @@
%post -n kernel%{_alt_kernel}-misc-vboxadd
%depmod %{_kernel_ver}
/sbin/chkconfig --add vboxadd
-%service vboxadd restart "VirtualBox OSE guest additions driver"
+%service vboxadd restart "VirtualBox OSE Guest additions driver"
%postun -n kernel%{_alt_kernel}-misc-vboxadd
%depmod %{_kernel_ver}
@@ -469,7 +472,7 @@
%post -n kernel%{_alt_kernel}-misc-vboxdrv
%depmod %{_kernel_ver}
/sbin/chkconfig --add vboxdrv
-%service vboxdrv restart "VirtualBox OSE driver"
+%service vboxdrv restart "VirtualBox USE Support Driver"
%postun -n kernel%{_alt_kernel}-misc-vboxdrv
%depmod %{_kernel_ver}
@@ -497,7 +500,7 @@
%post -n kernel%{_alt_kernel}-misc-vboxvfs
%depmod %{_kernel_ver}
/sbin/chkconfig --add vboxvfs
-%service vboxvfs restart "VirtualBox OSE guest additions VFS driver"
+%service vboxvfs restart "VirtualBox OSE Host file system access VFS"
%postun -n kernel%{_alt_kernel}-misc-vboxvfs
%depmod %{_kernel_ver}
@@ -522,7 +525,6 @@
%dir %{_libdir}/VirtualBox/additions
%dir %{_libdir}/VirtualBox/components
%dir %{_libdir}/VirtualBox/nls
-%attr(755,root,root) %{_bindir}/mountvboxsf
%attr(755,root,root) %{_bindir}/VBoxBFE
%attr(755,root,root) %{_bindir}/VBoxHeadless
%attr(755,root,root) %{_bindir}/VBoxManage
@@ -644,6 +646,7 @@
%files -n kernel%{_alt_kernel}-misc-vboxvfs
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/vboxvfs
+%attr(755,root,root) %{_sbindir}/mount.vboxsf
/etc/modprobe.d/vboxvfs.conf
/lib/modules/%{_kernel_ver}/misc/vboxvfs.ko*
@@ -658,6 +661,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.235 2009/11/17 14:42:21 glen
+- install mountvboxsf as /sbin/mount.vboxsf and move it to vboxvfs kernel
package
+- adapter, desc cosmetics; rel 4
+
Revision 1.234 2009/11/17 14:21:10 glen
- alias vboxsf vboxvfs
- preserve timestamps of installed files; rel 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.234&r2=1.235&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
