jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 83639 from home:elvigia:branches:Virtualization

Browse Source 
- Use config noreplace for udev rules, avoid overwrite of USB
  udev rules.

OBS-URL: https://build.opensuse.org/request/show/83639
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=59
This commit is contained in:
Michal Seben 2011-09-19 18:07:13 +00:00 committed by Git OBS Bridge
parent 7ba7d8aacc
commit 4544cdb165
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
virtualbox.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Sep 19 17:55:56 UTC 2011 - crrodriguez@opensuse.org
- Use config noreplace for udev rules, avoid overwrite of USB
udev rules.
-------------------------------------------------------------------
Thu Sep 15 10:17:05 UTC 2011 - mseben@gmail.com

21
virtualbox.spec
View File

@ -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"
######################################################
@ -615,7 +612,7 @@ exit 0
%{_vbox_instdir}/components/*.xpt
%dir %{_datadir}/virtualbox
%config %{_sysconfdir}/default/virtualbox
%config %{_sysconfdir}/udev/rules.d/60-vboxdrv.rules
%config(noreplace) %{_sysconfdir}/udev/rules.d/60-vboxdrv.rules
%config %{_sysconfdir}/init.d/vboxdrv
%{_sysconfdir}/init.d/vboxes
%{_var}/adm/fillup-templates/sysconfig.vbox
@ -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,15 +665,17 @@ exit 0
%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
%endif
#
%files guest-tools
%defattr(-, root, root)
%{_bindir}/VBoxControl
%{_bindir}/VBoxService
/sbin/mount.vboxsf
%config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
%config(noreplace) %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
%config %{_sysconfdir}/init.d/vboxadd
%{_sbindir}/rcvboxadd
#
%files -n python-%{name} -f %{_tmppath}/SITE_FILES
%defattr(-, root, root)
%dir %{_vbox_instdir}/sdk