Author: glen Date: Tue Dec 29 11:44:25 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- use desktop file from sources (more complete)
---- Files affected:
packages/VirtualBox:
VirtualBox.spec (1.248 -> 1.249) , VirtualBox.desktop (1.2 -> NONE)
(REMOVED)
---- Diffs:
================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.248
packages/VirtualBox/VirtualBox.spec:1.249
--- packages/VirtualBox/VirtualBox.spec:1.248 Sun Dec 27 22:01:12 2009
+++ packages/VirtualBox/VirtualBox.spec Tue Dec 29 12:44:20 2009
@@ -47,7 +47,6 @@
Source4: %{pname}-vboxguest.init
Source5: %{pname}-vboxnetflt.init
Source6: %{pname}-vboxvfs.init
-Source7: %{pname}.desktop
Source8: %{pname}.sh
Source9: mount.vdi
Patch0: %{pname}-configure.patch
@@ -328,12 +327,15 @@
%patch2 -p1
%patch3 -p1
+%{__sed} -i -e 's,$VBOX_DOC_PATH,%{_docdir}/%{name}-%{version},'
src/VBox/Installer/linux/virtualbox.desktop
+%{__sed} -i -e 's/Categories=.*/Categories=Utility;Emulator;/'
src/VBox/Installer/linux/virtualbox.desktop
+
cat <<'EOF' > udev.conf
KERNEL=="vboxdrv", NAME="%k", GROUP="vbox", MODE="0660"
KERNEL=="vboxguest", NAME="%k", GROUP="vbox", MODE="0660"
EOF
-install %{SOURCE1} .
+cp -a %{SOURCE1} .
sed 's...@libdir@#%{_libdir}#' < %{SOURCE8} > VirtualBox-wrapper.sh
rm -rf PLD-MODULE-BUILD && mkdir PLD-MODULE-BUILD && cd PLD-MODULE-BUILD
@@ -341,9 +343,6 @@
tar -zxf modules.tar.gz && rm -f modules.tar.gz
../src/VBox/HostDrivers/linux/export_modules modules.tar.gz
--without-hardening && \
tar -zxf modules.tar.gz && rm -f modules.tar.gz
-#./src/VBox/HostDrivers/Support/linux/Makefile:70:
-#./PLD-MODULE-BUILD/vboxdrv/Makefile:70:
-
%build
%if %{with userspace}
@@ -408,7 +407,7 @@
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
install -p out/linux.%{outdir}/release/bin/VBox.png
$RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
-cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
+cp -a out/linux.%{outdir}/release/bin/virtualbox.desktop
$RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
install -d $RPM_BUILD_ROOT/etc/udev/rules.d
cp -a udev.conf $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules
@@ -676,6 +675,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.249 2009/12/29 11:44:20 glen
+- use desktop file from sources (more complete)
+
Revision 1.248 2009/12/27 21:01:12 lkrotowski
- missing BR
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.248&r2=1.249&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
