rpms/VirtualBox/F-17 VirtualBox-OSE-90-vboxdrv.rules, 1.6, 1.7 VirtualBox.spec, 1.3, 1.4

[Sérgio M. Basto]

Author: sergiomb

Update of /cvs/free/rpms/VirtualBox/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7708

Modified Files:
	VirtualBox-OSE-90-vboxdrv.rules VirtualBox.spec 
Log Message:
* Sat Jun 09 2012 Sérgio Basto <sergio at serjux.com> - 4.1.16-3
- From Packaging Guidelines, https://fedoraproject.org/wiki/Packaging:Systemd, Packages with systemd
  unit files must put them into %{_unitdir}.
- Install VBoxCreateUSBNode.sh in /lib/udev, and udev rules from upstream.



Index: VirtualBox-OSE-90-vboxdrv.rules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/VirtualBox-OSE-90-vboxdrv.rules,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VirtualBox-OSE-90-vboxdrv.rules	22 Sep 2011 10:04:38 -0000	1.6
+++ VirtualBox-OSE-90-vboxdrv.rules	9 Jun 2012 21:57:10 -0000	1.7
@@ -1,3 +1,4 @@
-ACTION=="add", DEVPATH=="/devices/virtual/misc/vboxdrv", OWNER="root", MODE="0600"
-ACTION=="add", DEVPATH=="/devices/virtual/misc/vboxnetctl", OWNER="root", MODE="0600"
-ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{bDeviceClass}!="09", GROUP="vboxusers", MODE="660", SYMLINK+="vboxusb/$env{BUSNUM}/$env{DEVNUM}"
+SUBSYSTEM=="usb_device", ACTION=="add", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh --remove $major $minor"


Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/VirtualBox.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VirtualBox.spec	31 May 2012 05:02:21 -0000	1.3
+++ VirtualBox.spec	9 Jun 2012 21:57:10 -0000	1.4
@@ -1,7 +1,5 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%global systemd_dir /lib/systemd/system
-
 # Standard compiler flags, without:
 # -Wall	       -- VirtualBox takes care of reasonable warnings very well
 # -m32, -m64   -- 32bit code is built besides 64bit on x86_64
@@ -17,7 +15,7 @@
 
 Name:		VirtualBox
 Version:	4.1.16
-Release:	2%{?prerel:.%{prerel}}%{?dist}
+Release:	3%{?prerel:.%{prerel}}%{?dist}
 Summary:	A general-purpose full virtualizer for PC hardware
 
 Group:		Development/Tools
@@ -82,6 +80,11 @@
 BuildRequires:	libXcomposite-devel
 BuildRequires:	libXmu-devel
 
+BuildRequires: systemd-units
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+
 # Plague-specific weirdness
 %if 0%{?fedora} > 11 || 0%{?rhel} > 5
 ExclusiveArch:	i686 x86_64
@@ -91,10 +94,6 @@
 ExclusiveArch:	i386 x86_64
 %endif
 
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-
 Provides:	%{name}-OSE = %{version}-%{release}
 Obsoletes:	%{name}-OSE < %{version}-%{release}
 Requires:	%{name}-kmod = %{version}%{?prereltag}
@@ -353,10 +352,13 @@
 	$RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
 
 install -m 0644 -D %{SOURCE10} \
-	$RPM_BUILD_ROOT%{systemd_dir}/vboxweb.service
+	$RPM_BUILD_ROOT%{_unitdir}/vboxweb.service
 
 install -m 0644 -D %{SOURCE11} \
-	$RPM_BUILD_ROOT%{systemd_dir}/vboxservice.service
+	$RPM_BUILD_ROOT%{_unitdir}/vboxservice.service
+
+install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh \
+	$RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh
 
 install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
 	$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
@@ -512,7 +514,8 @@
 %config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
 %config %{_sysconfdir}/sysconfig/modules/%{name}.modules
 %doc COPYING
-%{systemd_dir}/vboxweb.service
+%{_unitdir}/vboxweb.service
+/lib/udev/VBoxCreateUSBNode.sh
 
 
 %files devel
@@ -540,7 +543,7 @@
 %config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
 %config %{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
 %doc COPYING
-%{systemd_dir}/vboxservice.service
+%{_unitdir}/vboxservice.service
 
 
 %files kmodsrc
@@ -548,6 +551,11 @@
 
 
 %changelog
+* Sat Jun 09 2012 Sérgio Basto <sergio at serjux.com> - 4.1.16-3
+- From Packaging Guidelines, https://fedoraproject.org/wiki/Packaging:Systemd, Packages with systemd
+  unit files must put them into %{_unitdir}.
+- Install VBoxCreateUSBNode.sh in /lib/udev, and udev rules from upstream.
+
 * Wed May 23 2012 Sérgio Basto <sergio at serjux.com> - 4.1.16-2
 - Obsolete also VirtualBox-OSE-kmodsrc.