[packages/VirtualBox] - renumbered patches - rm Virtualbox-export_modules.patch file
charles
charles at pld-linux.org
Sun Oct 28 17:38:50 CET 2012
commit db6f33e33b3804944675e479b06637bc901211c4
Author: Karol Krenski <charles at pld-linux.org>
Date: Sun Oct 28 17:38:43 2012 +0100
- renumbered patches
- rm Virtualbox-export_modules.patch file
VirtualBox-export_modules.patch | 18 ------------------
VirtualBox.spec | 14 ++++++--------
2 files changed, 6 insertions(+), 26 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index d5d7e50..1857981 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -62,12 +62,11 @@ Source15: %{pname}-vboxsf-modules-load.conf
Source16: %{pname}-vboxnetadp-modules-load.conf
Source17: %{pname}-vboxpci-modules-load.conf
Patch0: %{pname}-configure-spaces.patch
-
-Patch2: %{pname}-VBoxSysInfo.patch
-Patch3: %{pname}-warning_workaround.patch
-Patch4: %{pname}-dri.patch
-Patch5: %{pname}-disable_build_NetBiosBin.patch
-Patch6: xserver-1.12.patch
+Patch1: %{pname}-VBoxSysInfo.patch
+Patch2: %{pname}-warning_workaround.patch
+Patch3: %{pname}-dri.patch
+Patch4: %{pname}-disable_build_NetBiosBin.patch
+Patch5: xserver-1.12.patch
# ubuntu patches
Patch10: 16-no-update.patch
Patch11: 18-system-xorg.patch
@@ -504,12 +503,11 @@ Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM.
%prep
%setup -q -n %{pname}-%{version}
%patch0 -p1
-
+%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
%{__sed} -i -e 's, at VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
diff --git a/VirtualBox-export_modules.patch b/VirtualBox-export_modules.patch
deleted file mode 100644
index 3f71226..0000000
--- a/VirtualBox-export_modules.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- VirtualBox-3.1.8_OSE/src/VBox/Additions/linux/export_modules.orig 2010-05-10 08:45:29.000000000 +0200
-+++ VirtualBox-3.1.8_OSE/src/VBox/Additions/linux/export_modules 2010-05-16 14:15:16.321158339 +0200
-@@ -71,6 +73,15 @@
- install -D -m 0755 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxsf/`echo $f|cut -d'>' -f2`"
- done
-
-+# vboxvideo_drm (VirtualBox guest kernel module for DRI)
-+mkdir $PATH_TMP/vboxvideo_drm || exit 1
-+for f in $FILES_VBOXVIDEO_DRM_NOBIN; do
-+ install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxvideo_drm/`echo $f|cut -d'>' -f2`"
-+done
-+for f in $FILES_VBOXVIDEO_DRM_BIN; do
-+ install -D -m 0755 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxvideo_drm/`echo $f|cut -d'>' -f2`"
-+done
-+
- # Only temporary, omit from archive
- rm $PATH_TMP/version-generated.h
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/db6f33e33b3804944675e479b06637bc901211c4
More information about the pld-cvs-commit
mailing list