From 016099dd6aec275c11f12459733de1243c0e7b740ff55a739d810bfb5a007c81 Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Fri, 16 Sep 2011 07:35:36 +0000 Subject: [PATCH 1/3] Accepting request 82285 from home:mseben:branches:Virtualization - included proper versions of vboxmouse_drv and vboxvideo_drv (xorg drivers) in to virtualbox-guest-x11 - fixed typo in virtualbox-60-vboxdrv.rules OBS-URL: https://build.opensuse.org/request/show/82285 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=55 --- virtualbox-60-vboxdrv.rules | 2 +- virtualbox.changes | 7 +++++++ virtualbox.spec | 10 +++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/virtualbox-60-vboxdrv.rules b/virtualbox-60-vboxdrv.rules index add34ee..a23e6fa 100644 --- a/virtualbox-60-vboxdrv.rules +++ b/virtualbox-60-vboxdrv.rules @@ -1,5 +1,5 @@ KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" #these two lines give access permission to vboxusers to properly work with usb nodes, this could be security risk (bnc#664520) !! #SUBSYSTEM=="usb_device", ATTR{devnum}=="?*", ATTR{busnum}=="?*",SYMLINK+="vboxusb/$attr{busnum}/$attr{devnum}", GROUP="vboxusers" -#SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{devnum}=="?*", ATTR{busnum}=="?*",SYMLINK="vboxusb/$attr{busnum}/$attr{devnum}", GROUP="vboxusers" +#SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{devnum}=="?*", ATTR{busnum}=="?*",SYMLINK+="vboxusb/$attr{busnum}/$attr{devnum}", GROUP="vboxusers" diff --git a/virtualbox.changes b/virtualbox.changes index 7dadbf9..709ac1a 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 15 10:17:05 UTC 2011 - mseben@gmail.com + +- included proper versions of vboxmouse_drv and vboxvideo_drv (xorg drivers) in to + virtualbox-guest-x11 +- fixed typo in virtualbox-60-vboxdrv.rules + ------------------------------------------------------------------- Mon Aug 22 11:29:11 UTC 2011 - mseben@gmail.com diff --git a/virtualbox.spec b/virtualbox.spec index 4976fea..1e917da 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -227,6 +227,7 @@ Development file for %{name} %patch100 %patch101 %patch102 +#%patch103 -p1 #copy user manual %__cp %{S:1} ./UserManual.pdf @@ -355,7 +356,13 @@ pushd out/linux.*/release/bin/additions/ #VBoxClient daemon (support for clipboard,autoresize,seamless windows) %__install -m 755 VBoxClient %{buildroot}%{_bindir} # xorg drivers for mouse and videos check suse version to add propper driver -%if %suse_version > 1130 +%if %suse_version > 1140 + %__install -m 755 vboxmouse_drv_110.so \ + %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so + %__install -m 755 vboxvideo_drv_110.so \ + %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so +%else +%if %suse_version == 1140 %__install -m 755 vboxmouse_drv_19.so \ %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so %__install -m 755 vboxvideo_drv_19.so \ @@ -380,6 +387,7 @@ pushd out/linux.*/release/bin/additions/ %endif %endif %endif +%endif popd # VBoxOGL* libs for guest-x11 subpackage %__install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \ From e1f4a13b60fe7bf756e5896bc34cb5c489f8f3eab5772830f7beb392ec16ba71 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 19 Sep 2011 10:16:16 +0000 Subject: [PATCH 2/3] prepare_spec OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=58 --- virtualbox.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/virtualbox.spec b/virtualbox.spec index 1e917da..327a2c1 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -1,7 +1,7 @@ # -# spec file for package virtualbox (Version 3.9.80) +# spec file for package virtualbox # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ BuildRequires: pmtools %endif #drop hal dependency %if %suse_version < 1210 -BuildRequires: hal-devel +BuildRequires: hal-devel %endif %if %suse_version >= 1210 BuildRequires: glibc-devel-static @@ -37,7 +37,7 @@ BuildRequires: bin86 dev86 libidl-devel libqt4-devel libxslt-devel yasm BuildRequires: SDL-devel kernel-syms module-init-tools BuildRequires: e2fsprogs-devel libcap-devel libcurl-devel python-devel update-desktop-files BuildRequires: pulseaudio-devel xorg-x11 xorg-x11-devel xorg-x11-server xorg-x11-server-sdk -BuildRequires: LibVNCServer-devel gcc gcc-c++ kbuild pam-devel udev quilt +BuildRequires: LibVNCServer-devel gcc gcc-c++ kbuild pam-devel quilt udev BuildRequires: boost-devel %if %suse_version > 1110 BuildRequires: zlib-devel-static @@ -49,7 +49,7 @@ BuildRequires: hal-32bit %endif BuildRequires: xorg-x11-libX11-devel-32bit xorg-x11-libXt-devel-32bit xorg-x11-libs-32bit BuildRequires: xorg-x11-libXext-devel-32bit xorg-x11-libXmu-devel-32bit -BuildRequires: gcc-32bit gcc-c++-32bit +BuildRequires: gcc-32bit gcc-c++-32bit %endif # ExclusiveArch: %ix86 x86_64 @@ -459,7 +459,6 @@ popd #install wrapper script %__install -m 644 %{S:9} %{buildroot}%{_bindir}/VirtualBox - # modify and install the vboxdrv init script # TODO: some of this stuff breaks the fillup macros below? %__sed -i "s|%NOLSB%|yes|g;s|%DEBIAN%||g;s|%PACKAGE%|virtualbox|g" src/VBox/Installer/linux/vboxdrv.sh.in @@ -474,8 +473,6 @@ popd %__install -d -m 755 %{buildroot}%{_var}/adm/fillup-templates install -m 700 %{S:13} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox - - ###################################################### echo "entrering python-virtualbox install section" ###################################################### @@ -635,6 +632,7 @@ exit 0 %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxHeadless %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSDL # + %files qt %defattr(-, root, root) %{_vbox_instdir}/VBoxPermissionMessage @@ -649,6 +647,7 @@ exit 0 %{_datadir}/pixmaps/virtualbox.png %{_datadir}/applications/%{name}.desktop # + %files guest-x11 %defattr(-, root, root) %dir %{_libdir}/xorg/modules/drivers @@ -666,6 +665,7 @@ exit 0 %{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi %endif # + %files guest-tools %defattr(-, root, root) %{_bindir}/VBoxControl @@ -675,6 +675,7 @@ exit 0 %config %{_sysconfdir}/init.d/vboxadd %{_sbindir}/rcvboxadd # + %files -n python-%{name} -f %{_tmppath}/SITE_FILES %defattr(-, root, root) %dir %{_vbox_instdir}/sdk From 7ba7d8aaccc5c3342ff114eea20b8f412d335128211c67f764799a6233c515df Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 19 Sep 2011 16:07:32 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/virtualbox revision 38.0 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=26afe31bba59b2fbac495774df53bd25 --- virtualbox.spec | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/virtualbox.spec b/virtualbox.spec index 327a2c1..1e917da 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -1,7 +1,7 @@ # -# spec file for package virtualbox +# spec file for package virtualbox (Version 3.9.80) # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ BuildRequires: pmtools %endif #drop hal dependency %if %suse_version < 1210 -BuildRequires: hal-devel +BuildRequires: hal-devel %endif %if %suse_version >= 1210 BuildRequires: glibc-devel-static @@ -37,7 +37,7 @@ BuildRequires: bin86 dev86 libidl-devel libqt4-devel libxslt-devel yasm BuildRequires: SDL-devel kernel-syms module-init-tools BuildRequires: e2fsprogs-devel libcap-devel libcurl-devel python-devel update-desktop-files BuildRequires: pulseaudio-devel xorg-x11 xorg-x11-devel xorg-x11-server xorg-x11-server-sdk -BuildRequires: LibVNCServer-devel gcc gcc-c++ kbuild pam-devel quilt udev +BuildRequires: LibVNCServer-devel gcc gcc-c++ kbuild pam-devel udev quilt BuildRequires: boost-devel %if %suse_version > 1110 BuildRequires: zlib-devel-static @@ -49,7 +49,7 @@ BuildRequires: hal-32bit %endif BuildRequires: xorg-x11-libX11-devel-32bit xorg-x11-libXt-devel-32bit xorg-x11-libs-32bit BuildRequires: xorg-x11-libXext-devel-32bit xorg-x11-libXmu-devel-32bit -BuildRequires: gcc-32bit gcc-c++-32bit +BuildRequires: gcc-32bit gcc-c++-32bit %endif # ExclusiveArch: %ix86 x86_64 @@ -459,6 +459,7 @@ popd #install wrapper script %__install -m 644 %{S:9} %{buildroot}%{_bindir}/VirtualBox + # modify and install the vboxdrv init script # TODO: some of this stuff breaks the fillup macros below? %__sed -i "s|%NOLSB%|yes|g;s|%DEBIAN%||g;s|%PACKAGE%|virtualbox|g" src/VBox/Installer/linux/vboxdrv.sh.in @@ -473,6 +474,8 @@ popd %__install -d -m 755 %{buildroot}%{_var}/adm/fillup-templates install -m 700 %{S:13} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox + + ###################################################### echo "entrering python-virtualbox install section" ###################################################### @@ -632,7 +635,6 @@ exit 0 %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxHeadless %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSDL # - %files qt %defattr(-, root, root) %{_vbox_instdir}/VBoxPermissionMessage @@ -647,7 +649,6 @@ exit 0 %{_datadir}/pixmaps/virtualbox.png %{_datadir}/applications/%{name}.desktop # - %files guest-x11 %defattr(-, root, root) %dir %{_libdir}/xorg/modules/drivers @@ -665,7 +666,6 @@ exit 0 %{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi %endif # - %files guest-tools %defattr(-, root, root) %{_bindir}/VBoxControl @@ -675,7 +675,6 @@ exit 0 %config %{_sysconfdir}/init.d/vboxadd %{_sbindir}/rcvboxadd # - %files -n python-%{name} -f %{_tmppath}/SITE_FILES %defattr(-, root, root) %dir %{_vbox_instdir}/sdk