rpms/VirtualBox/F-18 .cvsignore, 1.41, 1.42 VirtualBox-4.1.20-x113.patch, 1.1, 1.2 VirtualBox.spec, 1.24, 1.25 sources, 1.41, 1.42

[Sérgio M. Basto]

Author: sergiomb

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

Modified Files:
	.cvsignore VirtualBox-4.1.20-x113.patch VirtualBox.spec 
	sources 
Log Message:
* Mon Dec 24 2012 Sérgio Basto <sergio at serjux.com> - 4.2.4-1
- New upstream release.
- Fix some changelog dates.



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	28 Oct 2012 16:54:57 -0000	1.41
+++ .cvsignore	25 Dec 2012 01:38:33 -0000	1.42
@@ -1 +1 @@
-VirtualBox-4.2.4.tar.bz2
+VirtualBox-4.2.6.tar.bz2

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/F-18/VirtualBox-4.1.20-x113.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.1.20-x113.patch	8 Sep 2012 02:08:19 -0000	1.1
+++ VirtualBox-4.1.20-x113.patch	25 Dec 2012 01:38:33 -0000	1.2
@@ -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/F-18/VirtualBox.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- VirtualBox.spec	28 Oct 2012 16:51:01 -0000	1.24
+++ VirtualBox.spec	25 Dec 2012 01:38:33 -0000	1.25
@@ -13,8 +13,20 @@
 #global prerel RC4
 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
 
+#if 0%{?fedora} < 20
+%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
+Version:    4.2.6
 Release:    1%{?prerel:.%{prerel}}%{?dist}
 Summary:    A general-purpose full virtualizer for PC hardware
 
@@ -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,12 @@
 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:  device-mapper-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 +213,8 @@
 %patch25 -p1 -b .xorg111
 %endif
 
+%patch26 -p1 -b .nobundles
+
 # Remove prebuilt binary tools
 %if 0%{?fedora} < 16
 rm -rf kBuild
@@ -204,18 +224,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 +305,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 +327,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 +342,7 @@
     obj/bin/VBoxTestOGL \
     obj/bin/VBoxExtPackHelperApp \
     obj/bin/VBoxBalloonCtrl \
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
     obj/bin/vboxwebsrv  \
     obj/bin/webtest     \
 %endif
@@ -440,11 +464,6 @@
 /usr/bin/update-desktop-database &>/dev/null || :
 /usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
 
-# Web service
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-
 # Assign USB devices
 if /sbin/udevadm control --reload-rules >/dev/null 2>&1
 then
@@ -453,7 +472,8 @@
     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
 if [ $1 -eq 0 ] ; then
@@ -462,8 +482,14 @@
     /bin/systemctl stop vboxweb.service > /dev/null 2>&1 || :
 fi
 
-
 %postun
+if [ $1 -eq 0 ] ; then
+    # Package upgrade, not uninstall
+    # Web service
+    # Run these because the SysV package being removed won't do them
+    /sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
+fi
+
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 
 /usr/bin/update-desktop-database &>/dev/null || :
@@ -472,12 +498,14 @@
 %posttrans
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-
-# Guest additions install the OGL libraries
+# Guest additions install
 %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 || :
 
 %preun guest
 if [ $1 -eq 0 ] ; then
@@ -489,11 +517,6 @@
 %postun guest
 /sbin/ldconfig
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart vboxservice.service >/dev/null 2>&1 || :
-fi
-
 
 %files
 %{_bindir}/VBox
@@ -510,14 +533,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
@@ -528,7 +548,7 @@
 %{_libdir}/virtualbox/VBoxTestOGL
 %{_libdir}/virtualbox/VBoxXPCOMIPCD
 %{_libdir}/virtualbox/VBoxBalloonCtrl
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
 %{_libdir}/virtualbox/vboxwebsrv
 %{_libdir}/virtualbox/webtest
 %endif
@@ -546,7 +566,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
 
@@ -584,6 +608,20 @@
 
 
 %changelog
+* Mon Dec 24 2012 Sérgio Basto <sergio at serjux.com> - 4.2.4-1
+- New upstream release.
+- Fix some changelog dates.
+
+* 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.
+- Minor improves on systemd upgrade.
+
 * Sat Oct 27 2012 Sérgio Basto <sergio at serjux.com> - 4.2.4-1
 - New upstream release.
 - Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1. Changeset r43588, 
@@ -733,7 +771,7 @@
   apply these fixes to VBox 4.1.10 as well." and add -lssl and -lcrypto by my self.
 - drop Patch to allow to build with GCC 4.7
 
-* Tue Jan 15 2012 Sérgio Basto <sergio at serjux.com> - 4.1.8-4
+* Sun Jan 15 2012 Sérgio Basto <sergio at serjux.com> - 4.1.8-4
 - Patch to allow to build with GCC 4.7
 - Try fix usb/udev problem on updates without reboot computer.
 - Improves on xorg17 patch, which is the xorg on guest part, we try build with our sources!.
@@ -892,18 +930,18 @@
 - Exchange hardening for filesystem capabilities
 - Enable web services
 
-* Sun Aug 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.4-3
+* Sat Aug 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.4-3
 - Include VBoxRandR
 - Add dri module to guest
 - Resize attempts in GDM make SELinux unhappy
 - Fix HAL policy file location
 
-* Sun Aug 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.4-2
+* Sat Aug 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.4-2
 - Don't quote INSTALL_DIR in vbox.cfg so that we don't confuse vboxgtk
 - Add python- subpackage
 - Correct permissions on SDK directories (#754)
 
-* Sun Aug 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.4-1
+* Sat Aug 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.4-1
 - Update to later upstream release
 - Re-enable DRI again, fix drm_release crash
 
@@ -1059,7 +1097,7 @@
 - Update to new version
 - Adapt to new kBuild version, which seems to be needed
 
-* Wed Apr 21 2007 Till Maas <opensource till name> - 1.3.8-2
+* Sat Apr 21 2007 Till Maas <opensource till name> - 1.3.8-2
 - minor bugfixes in the wrapper script
 - rename to VirtualBox-OSE
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	28 Oct 2012 16:54:57 -0000	1.41
+++ sources	25 Dec 2012 01:38:33 -0000	1.42
@@ -1 +1 @@
-d1ec2d2a3f2f3f0b277dfe2c520c2e33  VirtualBox-4.2.4.tar.bz2
+d680aeb3b4379b8281527aeb012b2df5  VirtualBox-4.2.6.tar.bz2