- AC-branch merge

Changed files:
    VirtualBox.spec -> 1.68

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 8302b5116dd13ed339ec742cd2cfbac8db63017f..d5278505515d6ca5f3a47b2701957594cba29d4b 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -286,9 +286,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d \
        $RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_desktopdir}} \
        $RPM_BUILD_ROOT%{_libdir}/VirtualBox \
 install -d \
        $RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_desktopdir}} \
        $RPM_BUILD_ROOT%{_libdir}/VirtualBox \

-       $RPM_BUILD_ROOT/etc/rc.d/init.d \
-       $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers \
-       $RPM_BUILD_ROOT%{_libdir}/xorg/modules/input
+       $RPM_BUILD_ROOT/etc/rc.d/init.d

 
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtualbox
 
 
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtualbox
 


@@ -318,11 +316,13 @@ cp -a out/linux.%{outdir}/release/bin/nls/* $RPM_BUILD_ROOT%{_libdir}/VirtualBox
 install out/linux.%{outdir}/release/bin/additions/mountvboxsf          \
        $RPM_BUILD_ROOT%{_bindir}
 
 install out/linux.%{outdir}/release/bin/additions/mountvboxsf          \
        $RPM_BUILD_ROOT%{_bindir}
 

+%ifnarch %{x8664}
+install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}

 install out/linux.%{outdir}/release/bin/additions/vboxmouse_drv_14.so  \
        $RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/vboxmouse_drv.so
 install out/linux.%{outdir}/release/bin/additions/vboxmouse_drv_14.so  \
        $RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/vboxmouse_drv.so

-

 install out/linux.%{outdir}/release/bin/additions/vboxvideo_drv_14.so  \
        $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
 install out/linux.%{outdir}/release/bin/additions/vboxvideo_drv_14.so  \
        $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so

+%endif

 
 install out/linux.%{outdir}/release/bin/VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
 install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
 
 install out/linux.%{outdir}/release/bin/VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
 install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop