- updated to 1.4.0

- needs to check if builds on x8664

Changed files:
    VirtualBox-configure.patch -> 1.3
    VirtualBox-qt-paths.patch -> 1.3
    VirtualBox.spec -> 1.19

diff --git a/VirtualBox-configure.patch b/VirtualBox-configure.patch
index 524e86e1ca093f40846a80e259c56f0edea69978..94f92efc10cc88b6285d1302a0c5a299b221965e 100644 (file)
--- a/VirtualBox-configure.patch
+++ b/VirtualBox-configure.patch
@@ -1,14 +1,14 @@
---- configure.orig     2007-01-16 11:39:32.000000000 +0100
-+++ configure  2007-01-18 11:20:42.000000000 +0100
-@@ -51,7 +51,6 @@
- LIBZ="-lz"
- INCPNG=""
- LIBPNG="-lpng"
--QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/share/qt3"
+--- configure.orig     2007-08-23 21:34:25.000000000 +0200
++++ configure  2007-08-23 21:39:54.000000000 +0200
+@@ -57,7 +57,6 @@
+ CFLAGSHAL="-I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include"
+ LIBPATHHAL=""
+ LIBHAL="-lhal -ldbus-1"
+-QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3"
  KBUILDDIR="`cd $(dirname $0); pwd`/kBuild"
  DEVDIR="`cd $(dirname $0); pwd`/tools"
  if [ -d /lib/modules/`uname -r`/build ]; then
-@@ -148,8 +147,8 @@
+@@ -167,8 +166,8 @@
    echo "compiling the following source file:" >> $LOG
    cat .tmp_src.cc >> $LOG
    echo "using the following command line:" >> $LOG
@@ -19,26 +19,34 @@
    if (($?!=0)); then
      if [ -z "$4" ]; then
        echo -e "\n  $2 not found at $1 or $3 headers not found"
-@@ -873,29 +873,25 @@
+@@ -873,37 +872,26 @@
  }
  ' > .tmp_src.cc
    found_qt=0
+-  libs="lib"
+-  [ "$LIB" = "lib64" ] && libs="$libs lib64"
 -  for q in $QTDIR; do
--    echo "compiling the following source file:" >> $LOG
--    cat .tmp_src.cc >> $LOG
--    echo "using the following command line:" >> $LOG
--    echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/lib -lqt-mt" >> $LOG
--    $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/lib -lqt-mt >> $LOG 2>&1
--    if (($?==0)); then
--      if test_execute; then
--        cnf_append "QTDIR" `cd $q ; pwd`
--        found_qt=1
--        break
--      fi
+-    for l in $libs; do
+-      echo "compiling the following source file:" >> $LOG
+-      cat .tmp_src.cc >> $LOG
+-      echo "using the following command line:" >> $LOG
+-      echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt" >> $LOG
 +  echo "compiling the following source file:" >> $LOG
 +  cat .tmp_src.cc >> $LOG
 +  echo "using the following command line:" >> $LOG
 +  echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt" >> $LOG
+     
+-      $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt >> $LOG 2>&1
+-      if (($?==0)); then
+-        if test_execute; then
+-          cnf_append "QTDIR" "`cd $q ; pwd`"
+-          found_qt=1
+-          break
+-        fi
+-      fi
+-    done
+-    if (($found_qt==1)); then
+-      break
 +  $CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt >> $LOG 2>&1
 +  if (($?==0)); then
 +    if test_execute; then
@@ -61,21 +69,21 @@
      if (($?!=0)); then
        log_failure "not found"
        fail
-@@ -937,7 +932,6 @@
-   --with-iasl=PATH        the position of the iasl compiler [$IASL]
+@@ -1081,7 +1069,6 @@
+   --with-hal=LIB          location of the libhal libraries [$LIBHAL]
    --with-linux=DIR        Linux kernel source directory [$LINUX]
-   --with-mkisofs=PATH     position of mkisofs [$MKISOFS]
+   --with-mkisofs=PATH     location of mkisofs [$MKISOFS]
 -  --with-qt-dir=DIR       directory for QT headers/libraries [$QTDIR]
-   --with-xalan=LIB        position of the xalan library [$LIBXALAN]
-   --with-xerces=LIB       position of the xerces library [$LIBXERCES]
+   --with-xalan=LIB        location of the xalan library [$LIBXALAN]
+   --with-xerces=LIB       location of the xerces library [$LIBXERCES]
  
-@@ -970,9 +964,6 @@
-     --with-kbuild=*)
-       KBUILDDIR=`echo $option | cut -d'=' -f2`
+@@ -1118,9 +1105,6 @@
+         exit 1
+       fi
        ;;
 -    --with-qt-dir=*)
 -      QTDIR=`echo $option | cut -d'=' -f2`
 -      ;;
-     --with-iasl=*)
-       IASL=`echo $option | cut -d'=' -f2`
+     --with-hal-dir=*)
+       INCHAL=`echo $option | cut -d'=' -f2`
        ;;

diff --git a/VirtualBox-qt-paths.patch b/VirtualBox-qt-paths.patch
index 1b0a41c3b88a84860b9552fd6301917f6bbaf037..67cf1e2ad0c740fc5477293ff1e2a629d55f37ff 100644 (file)
--- a/VirtualBox-qt-paths.patch
+++ b/VirtualBox-qt-paths.patch
@@ -18,18 +18,23 @@
 @@ -1441,7 +1441,7 @@
  TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT $(ARCH_BITS_DEFS)
  TEMPLATE_VBOXQTGUIEXE_INCS = \
-       $(PATH_BIN)/sdk/include \
+       $(VBOX_PATH_SDK)/include \
 -      $(VBOX_PATH_QT)/include
 +      /usr/include/qt
  
  ifeq ($(BUILD_TARGET),win)
   TEMPLATE_VBOXQTGUIEXE_TOOL = $(VBOX_VCC_TOOL)
-@@ -1616,7 +1616,7 @@
-       $(PATH_LIB)/VBoxXPCOMGlue$(VBOX_SUFF_LIB)
++++ Config.kmk 2007-08-23 21:58:52.000000000 +0200
+@@ -1843,10 +1843,10 @@
  
-  TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
--      $(VBOX_PATH_QT)/lib \
-+      /usr/lib \
-       $(VBOX_LIBPATH_X11)
+  ifeq ($(BUILD_TARGET_ARCH),amd64)
+   TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
+-      $(VBOX_PATH_QT)/lib64 $(VBOX_PATH_QT)/lib
++      /usr/lib64 /usr/lib
+  else
+   TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
+-      $(VBOX_PATH_QT)/lib
++      /usr/lib
+  endif
  
- endif
+  ifeq ($(BUILD_TARGET),darwin)

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 8494fa312c882d4b2724dd5f0d45aa8b1fd9269f..2b5abbccd265df69a14db3aef2771f8d749865cf 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -16,17 +16,17 @@
 %bcond_without up              # without up packages
 %bcond_without smp             # without SMP kernel modules
 
-%define                _rel            0.2
+%define                _rel            0.1
 
 Summary:       VirtualBox
 Summary(pl.UTF-8):     VirtualBox
 Name:          VirtualBox
-Version:       1.3.6
+Version:       1.4.0
 Release:       %{_rel}
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://www.virtualbox.org/download/%{version}/VirtualBox-OSE-%{version}.tar.bz2
-# Source0-md5: 70c24ccee8b5778efd8d22f9996fbec9
+# Source0-md5: 8e89d32a67a3a39271f44039d0583a16
 Source1:       virtualbox.init
 Source2:       http://www.virtualbox.org/download/UserManual.pdf
 # Source2-md5: 2e5458bd5b4b9acd18cc86866e8a7284
@@ -230,7 +230,7 @@ for f in {VBox{BFE,Manage,SDL,SVC,XPCOMIPCD},VirtualBox}; do
        install VBox.sh $RPM_BUILD_ROOT%{_bindir}/$f
 done
 
-install out/linux.%{_outdir}/release/bin/VBox{C,DD,DD2,REM,REMImp,RT,VMM,XML,XPCOM,XPCOMIPCC}.so \
+install out/linux.%{_outdir}/release/bin/VBox{C,DD,DD2,DDU,REM,REMImp,RT,SVCM,VMM,XML,XPCOM,XPCOMIPCC}.so \
        $RPM_BUILD_ROOT%{_libdir}/VirtualBox
 install out/linux.%{_outdir}/release/bin/{VBox{DD,DD2}{GC.gc,R0.r0},VMM{GC.gc,R0.r0},*.xpt} \
        $RPM_BUILD_ROOT%{_libdir}/VirtualBox