rpms/VirtualBox/devel VirtualBox-4.2.4-no-bundles.patch, NONE, 1.1 VirtualBox-4.1.20-x113.patch, 1.2, 1.3 VirtualBox.spec, 1.31, 1.32 VirtualBox-4.2.0-xorg17.patch, 1.6, NONE

Sérgio M. Basto sergiomb at rpmfusion.org
Sun Dec 2 23:53:34 CET 2012 

Author: sergiomb

Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28947

Modified Files:
	VirtualBox-4.1.20-x113.patch VirtualBox.spec 
Added Files:
	VirtualBox-4.2.4-no-bundles.patch 
Removed Files:
	VirtualBox-4.2.0-xorg17.patch 
Log Message:
* Sun Dec 02 2012 Sérgio Basto <sergio at serjux.com> - 4.2.4-3
- Use global variables enable_webservice and enable_docs to deal better with enable and disable that.
- Include fr UserManual.pdf and put this docs in /usr/share/docs (the right place) .
- Unbundle sources that aren't used.


VirtualBox-4.2.4-no-bundles.patch:
 Config.kmk |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE VirtualBox-4.2.4-no-bundles.patch ---
--- ./Config.kmk.libcxx	2012-10-26 17:23:13.000000000 +0100
+++ ./Config.kmk	2012-11-24 14:46:31.187664914 +0000
@@ -2587,26 +2587,25 @@ VBOXLNX32GUEST_SUFF_LIB = .a
 # SDKs for external libraries.
 #
 SDK_VBOX_LIBXML2          = .
-SDK_VBOX_LIBXML2_INCS   ?= $(PATH_ROOT)/src/libs/libxml2-2.6.31/include
+SDK_VBOX_LIBXML2_INCS   ?= /usr/include/libxml2
 SDK_VBOX_LIBXML2_DEFS  ?= _REENTRANT
 SDK_VBOX_LIBXML2_DEFS.win += WIN32 _WINDOWS _MBCS
 # note: no linking to LIB here, we do that explicitly in src/VBox/Runtime/Makefile.kmk to link
 # libxml against VBoxRT
 
 SDK_VBOX_LIBPNG       = .
-SDK_VBOX_LIBPNG_INCS ?= $(PATH_ROOT)/src/libs/libpng-1.2.8
+SDK_VBOX_LIBPNG_INCS ?= /usr/include/libpng15
 SDK_VBOX_LIBPNG_LIBS ?= $(PATH_STAGE_LIB)/VBox-libpng$(VBOX_SUFF_LIB)
 
 SDK_VBOX_ZLIB         = .
 if1of ($(KBUILD_TARGET), os2 solaris win)
- SDK_VBOX_ZLIB_INCS  ?= $(PATH_ROOT)/src/libs/zlib-1.2.6
+ SDK_VBOX_ZLIB_INCS  ?= /usr/include/
  SDK_VBOX_ZLIB_LIBS  ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
 else
  SDK_VBOX_ZLIB_INCS  ?=
  SDK_VBOX_ZLIB_LIBS  ?= z
  SDK_VBOX_ZLIB_DEFS.linux ?= _LARGEFILE64_SOURCE
 endif
-
 SDK_VBOX_OPENSSL      = Only for VBoxRT and/or statically linked programs.
 SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-headers/include
 SDK_VBOX_OPENSSL_INCS ?= $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)

VirtualBox-4.1.20-x113.patch:
 vboxvideo.c     |   55 +++++++++++++++++++++++--------------------------------
 vboxvideo.h     |    2 +-
 vboxvideo_dri.c |    4 ++--
 3 files changed, 26 insertions(+), 35 deletions(-)

Index: VirtualBox-4.1.20-x113.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.1.20-x113.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VirtualBox-4.1.20-x113.patch	7 Sep 2012 03:03:37 -0000	1.2
+++ VirtualBox-4.1.20-x113.patch	2 Dec 2012 22:53:34 -0000	1.3
@@ -1,4 +1,4 @@
-X.org 1.13 patch 
+X.org 1.13 patch , not in use, just stay for references.
 Reference: 
 http://www.mail-archive.com/xorg-devel@lists.x.org/msg30282.html
  [PATCH 01/19] xserver: remove index from CloseScreen (API/ABI breakage) Dave Airlie


Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- VirtualBox.spec	29 Oct 2012 05:22:27 -0000	1.31
+++ VirtualBox.spec	2 Dec 2012 22:53:34 -0000	1.32
@@ -13,9 +13,21 @@
 #global prerel RC4
 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
 
+%if 0%{?fedora} < 18
+%global enable_webservice 1
+%else
+%global enable_webservice 0
+%endif
+
+%if 0%{?fedora} < 18
+%global enable_docs 1
+%else
+%global enable_docs 0
+%endif
+
 Name:       VirtualBox
 Version:    4.2.4
-Release:    2%{?prerel:.%{prerel}}%{?dist}
+Release:    3%{?prerel:.%{prerel}}%{?dist}
 Summary:    A general-purpose full virtualizer for PC hardware
 
 Group:      Development/Tools
@@ -43,6 +55,7 @@
 Patch23:    VirtualBox-4.2.0-mesa.patch
 Patch24:    VirtualBox-4.2.0-VBoxGuestLib.patch
 Patch25:    VirtualBox-4.2.0-xorg111.patch
+Patch26:    VirtualBox-4.2.4-no-bundles.patch
 
 %if 0%{?fedora} < 16
 BuildRequires:  kBuild >= 0.1.98
@@ -63,7 +76,11 @@
 BuildRequires:  mkisofs
 BuildRequires:  java-devel >= 1.6
 BuildRequires:  /usr/bin/pdflatex
+BuildRequires:  boost-devel
+#BuildRequires:  liblzf-devel
+BuildRequires:  libxml2-devel
 BuildRequires:  libpng-devel
+BuildRequires:  zlib-devel
 #BuildRequires:  glibc(x86-32) glibc-devel(x86-32) libstdc++(x86-32)
 #BuildRequires:  glibc.i686 glibc-devel.i686 libstdc++.i686
 #BuildRequires:  /usr/lib/libc.so
@@ -195,6 +212,8 @@
 %patch25 -p1 -b .xorg111
 %endif
 
+%patch26 -p1 -b .nobundles
+
 # Remove prebuilt binary tools
 %if 0%{?fedora} < 16
 rm -rf kBuild
@@ -204,18 +223,29 @@
 # Remove some bundle X11 sources.
 rm -rf src/VBox/Additions/x11/x11include
 rm -rf src/VBox/Additions/x11/x11stubs
+rm -rf src/libs/boost-1.37.0/   
+#rm -rf src/libs/liblzf-3.4/     
+rm -rf src/libs/libxml2-2.6.31/ 
+rm -rf src/libs/libpng-1.2.8/   
+rm -rf src/libs/zlib-1.2.6/ 
 
 # CRLF->LF
 sed -i 's/\r//' COPYING
 
+# Testings 
+#for S in doc/manual/fr_FR/*xml
+#do
+#    sed -i 's/[&][a-zA-Z0-9]\{2,5\}[;]/ /g' $S
+#done
 
 %build
 ./configure --disable-kmods \
-%if 0%{?fedora} > 17
-  --disable-docs
+%if %{enable_webservice}
+  --enable-webservice \
 %endif
-%if 0%{?fedora} < 18
- --enable-webservice
+%if %{enable_docs}
+%else
+  --disable-docs \
 %endif
 
 #--disable-java
@@ -274,7 +304,7 @@
 ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxheadless
 ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
 ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxballoonctrl
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
 ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
 %endif
 ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
@@ -296,13 +326,6 @@
     obj/bin/V*.r0       \
     obj/bin/VBoxEFI*.fd
 
-# Documentation
-%if 0%{?fedora} < 18
-install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
-    obj/bin/UserManual.pdf
-%endif
-
-
 # Executables
 install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
     obj/bin/VBoxHeadless    \
@@ -318,7 +341,7 @@
     obj/bin/VBoxTestOGL \
     obj/bin/VBoxExtPackHelperApp \
     obj/bin/VBoxBalloonCtrl \
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
     obj/bin/vboxwebsrv  \
     obj/bin/webtest     \
 %endif
@@ -448,6 +471,7 @@
     systemctl restart udev-trigger.service
     systemctl restart udev-settle.service
 fi
+# should be in kmod package, not here
 /bin/systemctl try-restart fedora-loadmodules.service >/dev/null 2>&1 || :
 
 %preun
@@ -477,6 +501,7 @@
 %post guest 
 /sbin/ldconfig
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+# should be in kmod package, not here
 /bin/systemctl try-restart fedora-loadmodules.service >/dev/null 2>&1 || :
 /bin/systemctl enable vboxservice.service >/dev/null 2>&1 || :
 /bin/systemctl restart vboxservice.service >/dev/null 2>&1 || :
@@ -507,14 +532,11 @@
 %{_bindir}/VBoxTunctl
 %{_bindir}/virtualbox
 %{_bindir}/VirtualBox
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
 %{_bindir}/vboxwebsrv
 %endif
 %{_bindir}/VBoxVRDP
-%if 0%{?fedora} < 18
 %dir %{_libdir}/virtualbox
-%doc %{_libdir}/virtualbox/*.pdf
-%endif
 %{_libdir}/virtualbox/*.[^p]*
 %{_libdir}/virtualbox/*.py*
 %{_libdir}/virtualbox/components
@@ -525,7 +547,7 @@
 %{_libdir}/virtualbox/VBoxTestOGL
 %{_libdir}/virtualbox/VBoxXPCOMIPCD
 %{_libdir}/virtualbox/VBoxBalloonCtrl
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
 %{_libdir}/virtualbox/vboxwebsrv
 %{_libdir}/virtualbox/webtest
 %endif
@@ -543,7 +565,11 @@
 %config %{_sysconfdir}/vbox/vbox.cfg
 %config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
 %config %{_sysconfdir}/sysconfig/modules/%{name}.modules
-%doc COPYING
+%doc COPYING*
+%doc doc/*.*
+%if %{enable_docs}
+%doc obj/bin/UserManual*.pdf
+%endif
 %{_unitdir}/vboxweb.service
 /lib/udev/VBoxCreateUSBNode.sh
 
@@ -581,6 +607,11 @@
 
 
 %changelog
+* Sun Dec 02 2012 Sérgio Basto <sergio at serjux.com> - 4.2.4-3
+- Use global variables enable_webservice and enable_docs to deal better with enable and disable that.
+- Include fr UserManual.pdf and put this docs in /usr/share/docs (the right place) .
+- Unbundle sources that aren't used.
+
 * Mon Oct 29 2012 Sérgio Basto <sergio at serjux.com> - 4.2.4-2
 - Try load new vbox modules right after install or upgrade.
 - Try better reload of vboxservice.service when as guest system.


--- VirtualBox-4.2.0-xorg17.patch DELETED ---

More information about the rpmfusion-commits mailing list