Author: glen Date: Thu Jan 28 16:06:39 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- simplify outdir macro
---- Files affected:
packages/VirtualBox:
VirtualBox.spec (1.255 -> 1.256)
---- Diffs:
================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.255
packages/VirtualBox/VirtualBox.spec:1.256
--- packages/VirtualBox/VirtualBox.spec:1.255 Thu Jan 28 16:06:50 2010
+++ packages/VirtualBox/VirtualBox.spec Thu Jan 28 17:06:33 2010
@@ -55,7 +55,7 @@
Patch2: %{pname}-export_modules.patch
Patch3: %{pname}-VBoxSysInfo.patch
URL: http://www.virtualbox.org/
-BuildRequires: rpmbuild(macros) >= 1.530
+BuildRequires: rpmbuild(macros) >= 1.531
%if %{with userspace}
%ifarch %{x8664}
BuildRequires: gcc-multilib
@@ -117,10 +117,11 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%ifarch %{x8664}
-%define outdir amd64
+%define vbox_platform linux.amd64
%else
-%define outdir x86
+%define vbox_platform linux.x86
%endif
+%define outdir out/%{box_platform}/release/bin
%define _sbindir /sbin
%description
@@ -406,35 +407,35 @@
install -p %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/mount.vdi
install -p VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_libdir}/VirtualBox
for f in {VBox{BFE,Headless,Manage,SDL,SVC,Tunctl,XPCOMIPCD},VirtualBox}; do
- install -p out/linux.%{outdir}/release/bin/$f
$RPM_BUILD_ROOT%{_libdir}/VirtualBox/$f
+ install -p %{outdir}/$f $RPM_BUILD_ROOT%{_libdir}/VirtualBox/$f
ln -s %{_libdir}/VirtualBox/VirtualBox-wrapper.sh
$RPM_BUILD_ROOT%{_bindir}/$f
done
-install -p out/linux.%{outdir}/release/bin/VBox{TestOGL,NetAdpCtl,NetDHCP} \
+install -p %{outdir}/VBox{TestOGL,NetAdpCtl,NetDHCP} \
$RPM_BUILD_ROOT%{_libdir}/VirtualBox
-install -p out/linux.%{outdir}/release/bin/VBox*.so \
+install -p %{outdir}/VBox*.so \
$RPM_BUILD_ROOT%{_libdir}/VirtualBox
-install -p
out/linux.%{outdir}/release/bin/{VBox{DD,DD2}{GC.gc,R0.r0},VMM{GC.gc,R0.r0}} \
+install -p %{outdir}/{VBox{DD,DD2}{GC.gc,R0.r0},VMM{GC.gc,R0.r0}} \
$RPM_BUILD_ROOT%{_libdir}/VirtualBox
-install -p out/linux.%{outdir}/release/bin/VBoxSysInfo.sh \
+install -p %{outdir}/VBoxSysInfo.sh \
$RPM_BUILD_ROOT%{_libdir}/VirtualBox
install -d $RPM_BUILD_ROOT%{_libdir}/VirtualBox/additions
install -d $RPM_BUILD_ROOT%{_libdir}/VirtualBox/nls
cp -a %{SOURCE2}
$RPM_BUILD_ROOT%{_libdir}/VirtualBox/additions/VBoxGuestAdditions.iso
-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
+cp -a %{outdir}/components $RPM_BUILD_ROOT%{_libdir}/VirtualBox
+cp -a %{outdir}/nls/* $RPM_BUILD_ROOT%{_libdir}/VirtualBox/nls
install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
-install -p out/linux.%{outdir}/release/bin/additions/vboxmouse_drv_17.so
\
+install -p %{outdir}/additions/vboxmouse_drv_17.so \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/vboxmouse_drv.so
-install -p out/linux.%{outdir}/release/bin/additions/vboxvideo_drv_17.so
\
+install -p %{outdir}/additions/vboxvideo_drv_17.so \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
-install -p out/linux.%{outdir}/release/bin/VBox.png
$RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
-cp -a out/linux.%{outdir}/release/bin/virtualbox.desktop
$RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
+cp -a %{outdir}/VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
+cp -a %{outdir}/virtualbox.desktop
$RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
install -d $RPM_BUILD_ROOT/etc/udev/rules.d
cp -a udev.conf $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules
@@ -715,6 +716,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.256 2010/01/28 16:06:33 glen
+- simplify outdir macro
+
Revision 1.255 2010/01/28 15:06:50 glen
- vboxvideo kernel driver needs drm kernel modules
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.255&r2=1.256&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
