- updated to 3.2.12

[packages/VirtualBox-bin.git] / VirtualBox-bin.spec

diff --git a/VirtualBox-bin.spec b/VirtualBox-bin.spec
index 7acd8fecaf36d4b9d0892c26ec55e4273e7836fe..1f304eabe0dbbbc1b58c66f8531f417a43f68a8a 100644 (file)
--- a/VirtualBox-bin.spec
+++ b/VirtualBox-bin.spec
@@ -14,27 +14,25 @@
 # disable debug - no symbols here
 %define                _enable_debug_packages  0
 %define                rel     1
-%ifarch %{x8664}
-%define                arch    amd64
-%else
-%define                arch    x86
-%endif
 
 %define                pname   VirtualBox
-%define                prev    64453
+%define                prev    68302
 
 Summary:       VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):     VirtualBox - wirtualizator sprzętu x86
 Name:          %{pname}-bin
-Version:       3.2.8
+Version:       3.2.12
 Release:       %{rel}
 License:       Free for non-commercial use, non-distributable
 Group:         Applications/Emulators
-Source0:       http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-%{prev}-Linux_%{arch}.run
-# NoSource0-md5:       9b85875277ef728527e421b7f69f5b55
+Source0:       http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-%{prev}-Linux_amd64.run
+# NoSource0-md5:       408db0aff4ada9664b8cdf156916ec64
 NoSource:      0
-Source1:       http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
-# Source1-md5: 322feb471c55b81e95e0caecdc93efb0
+Source1:       http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-%{prev}-Linux_x86.run
+# NoSource1-md5:       984b2dea108ba151ee5203f95987463c
+NoSource:      1
+Source2:       http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
+# Source2-md5: d7f8685fe5fd84757b33d46e6f0b6bc5
 Source3:       %{pname}-vboxdrv.init
 Source4:       %{pname}-vboxadd.init
 Source5:       %{pname}-vboxnetadp.init
@@ -236,21 +234,26 @@ głównego z poziomu systemu gościa.
 
 %prep
 %setup -qcT
+%ifarch %{x8664}
 %{__sh} %{SOURCE0} --noexec --keep
+%else
+%{__sh} %{SOURCE1} --noexec --keep
+%endif
+
 %{__tar} -jxf install/VirtualBox.tar.bz2
 
-install %{SOURCE1} .
+install %{SOURCE2} .
 sed 's#@LIBDIR@#%{_libdir}#' < %{SOURCE9} > VirtualBox-wrapper.sh
 
 rm -rf PLD-MODULE-BUILD && mkdir PLD-MODULE-BUILD && cd PLD-MODULE-BUILD
 cp -rdf ../src/* ./
-sed -i -e 's/-DVBOX_WITH_HARDENING//g' vboxdrv/Makefile
-sed -i -e 's/-DVBOX_WITH_HARDENING//g' vboxnetadp/Makefile
-sed -i -e 's/-DVBOX_WITH_HARDENING//g' vboxnetflt/Makefile
+sed -i -e 's/-DVBOX_WITH_HARDENING//g' vboxhost/vboxdrv/Makefile
+sed -i -e 's/-DVBOX_WITH_HARDENING//g' vboxhost/vboxnetadp/Makefile
+sed -i -e 's/-DVBOX_WITH_HARDENING//g' vboxhost/vboxnetflt/Makefile
 
 %build
 %if %{with kernel}
-cd PLD-MODULE-BUILD
+cd PLD-MODULE-BUILD/vboxhost
 %build_kernel_modules -m vboxdrv -C vboxdrv
 cp -a vboxdrv/Module.symvers vboxnetadp/
 %build_kernel_modules -m vboxnetadp -C vboxnetadp
@@ -307,9 +310,9 @@ install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxdrv
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetadp
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetflt
-%install_kernel_modules -m PLD-MODULE-BUILD/vboxdrv/vboxdrv -d misc
-%install_kernel_modules -m PLD-MODULE-BUILD/vboxnetadp/vboxnetadp -d misc
-%install_kernel_modules -m PLD-MODULE-BUILD/vboxnetflt/vboxnetflt -d misc
+%install_kernel_modules -m PLD-MODULE-BUILD/vboxhost/vboxdrv/vboxdrv -d misc
+%install_kernel_modules -m PLD-MODULE-BUILD/vboxhost/vboxnetadp/vboxnetadp -d misc
+%install_kernel_modules -m PLD-MODULE-BUILD/vboxhost/vboxnetflt/vboxnetflt -d misc
 %endif
 
 %clean
@@ -415,7 +418,13 @@ fi
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxOGLhostcrutil.so
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxOGLhosterrorspu.so
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxOGLrenderspu.so
+
+%if "%{pld_release}" == "ti"
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxPython2_6.so
+%else
+%attr(755,root,root) %{_libdir}/VirtualBox/VBoxPython2_7.so
+%endif
+
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxPython.so
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxREM.so
 %ifarch %{ix86}