Author: adamg Date: Tue Dec 1 07:47:12 2009 GMT Module: packages Tag: HEAD ---- Log message: - updated to 3.1.0 - vboxadd renamed to vboxguest
---- Files affected: packages/VirtualBox: VirtualBox.spec (1.241 -> 1.242) ---- Diffs: ================================================================ Index: packages/VirtualBox/VirtualBox.spec diff -u packages/VirtualBox/VirtualBox.spec:1.241 packages/VirtualBox/VirtualBox.spec:1.242 --- packages/VirtualBox/VirtualBox.spec:1.241 Mon Nov 23 09:33:20 2009 +++ packages/VirtualBox/VirtualBox.spec Tue Dec 1 08:47:06 2009 @@ -28,23 +28,23 @@ %define _enable_debug_packages 0 %endif -%define rel 3 +%define rel 0.1 %define pname VirtualBox Summary: VirtualBox OSE - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox OSE - wirtualizator sprzętu x86 Name: %{pname}%{_alt_kernel} -Version: 3.0.12 +Version: 3.1.0 Release: %{rel} License: GPL v2 Group: Applications/Emulators Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-OSE.tar.bz2 -# Source0-md5: 4cdf4a829db73fb502b8269676c8db30 +# Source0-md5: 442dff6ff4a8fe92d223d303b475a146 Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf -# Source1-md5: ac742f57893b46bb9324ae008b716059 +# Source1-md5: 51a6eebe5fedc6ac386fe39c1fba5b98 Source2: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source2-md5: bc756ed1b3f7874b098675970572206f +# Source2-md5: 75c4a7f99fa793492146555a6a54c9d3 Source3: %{pname}-vboxdrv.init -Source4: %{pname}-vboxadd.init +Source4: %{pname}-vboxguest.init Source5: %{pname}-vboxnetflt.init Source6: %{pname}-vboxvfs.init Source7: %{pname}.desktop @@ -178,7 +178,7 @@ %description udev -l pl.UTF-8 Reguły udev dla modułów jądra Linuksa dla VirtualBoksa. -%package -n kernel%{_alt_kernel}-misc-vboxadd +%package -n kernel%{_alt_kernel}-misc-vboxguest Summary: VirtualBox OSE Guest Additions for Linux Module Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa OSE Release: %{r...@%{_kernel_ver_str} @@ -189,13 +189,14 @@ %requires_releq_kernel Requires(postun): %releq_kernel %endif -Provides: kernel(vboxadd) = %{version}-%{rel} +Provides: kernel(vboxguest) = %{version}-%{rel} +Obsoletes: kernel%{_alt_kernel}-misc-vboxadd -%description -n kernel%{_alt_kernel}-misc-vboxadd +%description -n kernel%{_alt_kernel}-misc-vboxguest VirtualBox OSE Guest Additions for Linux Module. -%description -n kernel%{_alt_kernel}-misc-vboxadd -l pl.UTF-8 -Moduł jądra Linuksa vboxadd dla VirtualBoksa OSE - dodatki dla systemu +%description -n kernel%{_alt_kernel}-misc-vboxguest -l pl.UTF-8 +Moduł jądra Linuksa vboxguest dla VirtualBoksa OSE - dodatki dla systemu gościa. %package -n kernel%{_alt_kernel}-misc-vboxdrv @@ -246,7 +247,7 @@ Group: Base/Kernel Requires(post,postun): /sbin/depmod Requires: dev >= 2.9.0-7 -Requires: kernel%{_alt_kernel}-misc-vboxadd +Requires: kernel%{_alt_kernel}-misc-vboxguest %if %{with dist_kernel} %requires_releq_kernel Requires(postun): %releq_kernel @@ -318,7 +319,7 @@ cat <<'EOF' > udev.conf KERNEL=="vboxdrv", NAME="%k", GROUP="vbox", MODE="0660" -KERNEL=="vboxadd", NAME="%k", GROUP="vbox", MODE="0660" +KERNEL=="vboxguest", NAME="%k", GROUP="vbox", MODE="0660" EOF install %{SOURCE1} . @@ -347,10 +348,10 @@ %if %{with kernel} cd PLD-MODULE-BUILD -%build_kernel_modules -m vboxadd -C vboxadd +%build_kernel_modules -m vboxguest -C vboxguest %build_kernel_modules -m vboxdrv -C vboxdrv %build_kernel_modules -m vboxnetflt -C vboxnetflt -cp -a vboxadd/Module.symvers vboxvfs +cp -a vboxguest/Module.symvers vboxvfs %build_kernel_modules -m vboxvfs -C vboxvfs -c %build_kernel_modules -m vboxvideo -C vboxvideo_drm cd .. @@ -405,11 +406,11 @@ %if %{with kernel} install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,modprobe.d},%{_sbindir}} install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxdrv -install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxadd +install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxguest install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetflt install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxvfs -%install_kernel_modules -m PLD-MODULE-BUILD/vboxadd/vboxadd -d misc %install_kernel_modules -m PLD-MODULE-BUILD/vboxdrv/vboxdrv -d misc +%install_kernel_modules -m PLD-MODULE-BUILD/vboxguest/vboxguest -d misc %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 @@ -437,7 +438,7 @@ kernel-misc-vboxnetflt-%{version}-%{r...@%{_kernel_ver_str} On Guest Linux system you might want to install: - kernel-misc-vboxadd-%{version}-%{r...@%{_kernel_ver_str} + kernel-misc-vboxguest-%{version}-%{r...@%{_kernel_ver_str} kernel-misc-vboxvfs-%{version}-%{r...@%{_kernel_ver_str} kernel-misc-vboxvideo-%{version}-%{r...@%{_kernel_ver_str} @@ -456,18 +457,18 @@ %groupremove vbox fi -%post -n kernel%{_alt_kernel}-misc-vboxadd +%post -n kernel%{_alt_kernel}-misc-vboxguest %depmod %{_kernel_ver} -/sbin/chkconfig --add vboxadd -%service vboxadd restart "VirtualBox OSE Guest additions driver" +/sbin/chkconfig --add vboxguest +%service vboxguest restart "VirtualBox OSE Guest additions driver" -%postun -n kernel%{_alt_kernel}-misc-vboxadd +%postun -n kernel%{_alt_kernel}-misc-vboxguest %depmod %{_kernel_ver} -%preun -n kernel%{_alt_kernel}-misc-vboxadd +%preun -n kernel%{_alt_kernel}-misc-vboxguest if [ "$1" = "0" ]; then - %service vboxadd stop - /sbin/chkconfig --del vboxadd + %service vboxguest stop + /sbin/chkconfig --del vboxguest fi %post -n kernel%{_alt_kernel}-misc-vboxdrv @@ -561,7 +562,6 @@ %attr(755,root,root) %{_libdir}/VirtualBox/VBoxREM64.so %endif %attr(755,root,root) %{_libdir}/VirtualBox/VBoxRT.so -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxSettings.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxSharedClipboard.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxSharedCrOpenGL.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxSharedFolders.so @@ -587,6 +587,7 @@ %lang(bg) %{_libdir}/VirtualBox/nls/*_bg.qm %lang(ca) %{_libdir}/VirtualBox/nls/*_ca.qm %lang(cs) %{_libdir}/VirtualBox/nls/*_cs.qm +%lang(da) %{_libdir}/VirtualBox/nls/*_da.qm %lang(de) %{_libdir}/VirtualBox/nls/*_de.qm %lang(el) %{_libdir}/VirtualBox/nls/*_el.qm %lang(es) %{_libdir}/VirtualBox/nls/*_es.qm @@ -629,10 +630,10 @@ %endif %if %{with kernel} -%files -n kernel%{_alt_kernel}-misc-vboxadd +%files -n kernel%{_alt_kernel}-misc-vboxguest %defattr(644,root,root,755) -%attr(754,root,root) /etc/rc.d/init.d/vboxadd -/lib/modules/%{_kernel_ver}/misc/vboxadd.ko* +%attr(754,root,root) /etc/rc.d/init.d/vboxguest +/lib/modules/%{_kernel_ver}/misc/vboxguest.ko* %files -n kernel%{_alt_kernel}-misc-vboxdrv %defattr(644,root,root,755) @@ -662,6 +663,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.242 2009/12/01 07:47:06 adamg +- updated to 3.1.0 +- vboxadd renamed to vboxguest + Revision 1.241 2009/11/23 08:33:20 arekm - rel 3; up for new xserver ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.241&r2=1.242&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit