Changeset 34573 in vbox for trunk/src

Timestamp:

Dec 1, 2010 2:54:18 PM (14 years ago)

Author:

vboxsync

Message:

rpm/deb: more fixes

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/postinst.in (modified) (1 diff)
• rpm/VirtualBox.tmpl.spec (modified) (6 diffs)

trunk/src/VBox/Installer/linux/debian/postinst.in

@@ -91 +91 @@
     fi
   done
-  # Push the permissions to the USB device nodes.  One of these should match.
-  # Rather nasty to use udevadm trigger for this, but I don't know of any
-  # better way.
-  udevadm trigger --subsystem-match=usb > /dev/null 2>&1
-  udevtrigger --subsystem-match=usb > /dev/null 2>&1
-  udevtrigger --subsystem-match=usb_device > /dev/null 2>&1
-  udevplug -Busb > /dev/null 2>&1
 
   # create users groups (disable with INSTALL_NO_GROUP=1 in /etc/default/virtualbox)

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -68 +68 @@
 install -m 755 -d $RPM_BUILD_ROOT/usr/share/pixmaps
 install -m 755 -d $RPM_BUILD_ROOT/usr/share/icons/hicolor
-cd icons
-  for i in *; do
-    install -d -g 0 -o 0 $RPM_BUILD_ROOT/usr/share/icons/hicolor/$i/mimetypes
-    mv $i/* $(prefix)/usr/share/icons/hicolor/$i/mimetypes
-    rmdir $i
-  done
-cd -
 install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/virtualbox
 install -m 755 -d $RPM_BUILD_ROOT/usr/lib/virtualbox
 install -m 755 -d $RPM_BUILD_ROOT/usr/share/virtualbox
+install -m 755 -d $RPM_BUILD_ROOT/usr/share/mime/packages
 mv VBoxEFI32.fd $RPM_BUILD_ROOT/usr/lib/virtualbox || true
 mv VBoxEFI64.fd $RPM_BUILD_ROOT/usr/lib/virtualbox || true
@@ -101 +95 @@
 mv VBoxSysInfo.sh $RPM_BUILD_ROOT/usr/share/virtualbox
 mv VBoxCreateUSBNode.sh $RPM_BUILD_ROOT/usr/share/virtualbox
+cd icons
+  for i in *; do
+    install -d -g 0 -o 0 $RPM_BUILD_ROOT/usr/share/icons/hicolor/$i/mimetypes
+    mv $i/* $(prefix)/usr/share/icons/hicolor/$i/mimetypes
+    rmdir $i
+  done
+cd -
+rmdir icons
+mv virtualbox.xml /usr/share/mime/packages
 for i in VBoxManage VBoxSVC VBoxSDL VirtualBox VBoxHeadless vboxwebsrv webtest; do
   mv $i $RPM_BUILD_ROOT/usr/lib/virtualbox; done
@@ -259 +262 @@
   fi
 done
-# Push the permissions to the USB device nodes.  One of these should match.
-# Rather nasty to use udevadm trigger for this, but I don't know of any
-# better way.
-udevadm trigger --subsystem-match=usb > /dev/null 2>&1
-udevtrigger --subsystem-match=usb > /dev/null 2>&1
-udevtrigger --subsystem-match=usb_device > /dev/null 2>&1
-udevplug -Busb > /dev/null 2>&1
 
 # XXX SELinux: allow text relocation entries
@@ -302 +298 @@
 %update_menus
 %endif
+update-mime-database /usr/share/mime &> /dev/null || :
+touch --no-create /usr/share/icons/hicolor
+gtk-update-icon-cache -q /usr/share/icons/hicolor 2> /dev/null || :
 
 # Disable module compilation with INSTALL_NO_VBOXDRV=1 in /etc/default/virtualbox
@@ -409 +408 @@
 %clean_menus
 %endif
+update-mime-database /usr/share/mime &> /dev/null || :
+touch --no-create /usr/share/icons/hicolor
+gtk-update-icon-cache -q /usr/share/icons/hicolor 2> /dev/null || :
 
 
@@ -433 +435 @@
 /usr/lib/virtualbox
 /usr/share/applications
+/usr/share/icons
+/usr/share/mime/packages
 /usr/share/pixmaps
 /usr/share/virtualbox
-/usr/share/icons