X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=VirtualBox.spec;h=998d1300300b71740441073285e5d13fdbaf333b;hb=9c432cf11e60d50f1adda224708c691a293a3ed0;hp=fa675389bd95d5b16281f0e0d4b2c73d16e03d10;hpb=b8ae4b952cf10d1ff9edd5ff2d8d3de9af3e4c13;p=packages%2FVirtualBox.git

diff --git a/VirtualBox.spec b/VirtualBox.spec
index fa67538..998d130 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -47,14 +47,14 @@ exit 1
 Summary:	VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox - wirtualizator sprzętu x86
 Name:		%{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:	5.0.8
+Version:	5.0.20
 Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:	GPL v2
 Group:		Applications/Emulators
 Source0:	http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5:	8853a2ba183ecf255d0dc19b7584515f
+# Source0-md5:	2054e12c21cac025916df4162f18efd7
 Source1:	http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5:	28aa52d82296604e698e281a33cdaa3d
+# Source1-md5:	cc94e3885689533e1214e1a73355dbba
 Source2:	vboxservice.init
 Source3:	vboxservice.service
 Source5:	mount.vdi
@@ -78,7 +78,6 @@ Patch11:	18-system-xorg.patch
 Patch12:	%{pname}-all-translations.patch
 Patch13:	x32.patch
 Patch14:	%{pname}-no-scrextend.patch
-Patch15:	%{pname}-moc.patch
 URL:		http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -147,7 +146,7 @@ BuildRequires:	python-devel >= 2.3
 BuildRequires:	python-modules
 BuildRequires:	qt4-build
 BuildRequires:	qt4-linguist
-BuildRequires:	rpmbuild(macros) >= 1.701
+BuildRequires:	rpmbuild(macros) >= 1.715
 BuildRequires:	sed >= 4.0
 %if %{with doc}
 BuildRequires:	texlive-fonts-bitstream
@@ -527,7 +526,6 @@ cd ../..\
 %endif
 %patch13 -p1
 %patch14 -p1
-%patch15 -p0
 
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
 	-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
@@ -587,6 +585,8 @@ VBOX_PATH_DOCBOOK_DTD := %{_datadir}/sgml/docbook/xml-dtd-4.4
 # don't build testcases to save time, they are not needed for the package
 VBOX_WITH_TESTCASES :=
 VBOX_WITH_TESTSUITE :=
+
+VBOX_WITH_VRDP_RDESKTOP=
 EOF
 
 %undefine	filterout_c
@@ -608,8 +608,6 @@ EOF
 
 . "$PWD/env.sh"
 kmk %{?_smp_mflags}
-
-%{__cc} %{rpmcflags} %{rpmldflags} -Wall -Werror src/VBox/Additions/linux/sharedfolders/{mount.vboxsf.c,vbsfmount.c} -o mount.vboxsf
 %endif
 
 %{?with_kernel:%{expand:%build_kernel_packages}}
@@ -644,6 +642,7 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditions
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.so}
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_system.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
 # XXX: where else to install them that vboxvideo_dri.so finds them? patch with rpath?
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxEGL.so
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLarrayspu.so
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLcrutil.so
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLerrorspu.so
@@ -681,8 +680,7 @@ install -d $RPM_BUILD_ROOT/%{_lib}/security
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,/%{_lib}/security}/pam_vbox.so
 
 # mount.vboxsf
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/mount.vboxsf
-install -p mount.vboxsf $RPM_BUILD_ROOT/sbin/mount.vboxsf
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/mount.vboxsf $RPM_BUILD_ROOT/sbin/mount.vboxsf
 
 # mount.vdi
 install -p %{SOURCE5} $RPM_BUILD_ROOT/sbin/mount.vdi
@@ -741,7 +739,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{pname}/src $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/tst*
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/generated.sh
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack-license.*
-%{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/vboxapi*
+%{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/vboxapi*
 
 %if %{with gui}
 # cleanup lowercased variants, not used in any script (less cruft)
@@ -1000,6 +998,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %lang(cs) %{_datadir}/%{pname}/nls/*_cs.qm
 %lang(da) %{_datadir}/%{pname}/nls/*_da.qm
 %lang(de) %{_datadir}/%{pname}/nls/*_de.qm
+%lang(en) %{_datadir}/%{pname}/nls/*_el.qm
 %lang(en) %{_datadir}/%{pname}/nls/*_en.qm
 %lang(es) %{_datadir}/%{pname}/nls/*_es.qm
 %lang(eu) %{_datadir}/%{pname}/nls/*_eu.qm
@@ -1021,6 +1020,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %lang(ro) %{_datadir}/%{pname}/nls/*_ro.qm
 %lang(ru) %{_datadir}/%{pname}/nls/*_ru.qm
 %lang(sk) %{_datadir}/%{pname}/nls/*_sk.qm
+%lang(sk) %{_datadir}/%{pname}/nls/*_sl.qm
 %lang(sr) %{_datadir}/%{pname}/nls/*_sr.qm
 %lang(sv) %{_datadir}/%{pname}/nls/*_sv.qm
 %lang(tr) %{_datadir}/%{pname}/nls/*_tr.qm
@@ -1092,6 +1092,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/vboxvideo_dri.so
 # vboxvideo_dri.so deps
+%attr(755,root,root) %{_libdir}/VBoxEGL.so
 %attr(755,root,root) %{_libdir}/VBoxOGLarrayspu.so
 %attr(755,root,root) %{_libdir}/VBoxOGLcrutil.so
 %attr(755,root,root) %{_libdir}/VBoxOGLerrorspu.so