- use $QMAKE not qmake bin, to always use QMAKE configured

Changed files:
    bacula.spec -> 1.164
    qmake-bin.patch -> 1.1

diff --git a/bacula.spec b/bacula.spec
index 371471c67ed2771c48e81ba836836e15f845db47..2de72e8cbfbfaece3e964772c539ac62ee039b2d 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -57,6 +57,7 @@ Patch7:               %{name}-dbi_fixes.patch
 Patch8:                %{name}-dbi_dbcheck.patch
 Patch9:                %{name}-openssl1.patch
 Patch10:       %{name}-dvd_rewind.patch
+Patch11:       qmake-bin.patch
 URL:           http://www.bacula.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -472,6 +473,7 @@ Nagios plugin to check bacula.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
 

diff --git a/qmake-bin.patch b/qmake-bin.patch
new file mode 100644 (file)
index 0000000..70cf10c
--- /dev/null
+++ b/qmake-bin.patch
@@ -0,0 +1,17 @@
+--- bacula-5.0.3/autoconf/configure.in~        2010-10-22 12:48:37.000000000 +0300
++++ bacula-5.0.3/autoconf/configure.in 2010-10-22 12:50:14.083764096 +0300
+@@ -3195,13 +3195,12 @@
+       AC_MSG_ERROR([Could not find qmake $PATH. Check your Qt installation])
+    fi
+ 
+-   QMAKEBIN="qmake"
+    cd src/qt-console
+    echo "Creating bat Makefile"
+    touch bat
+    chmod 755 bat
+    rm -f Makefile
+-   $QMAKEBIN
++   $QMAKE
+    ${MAKE:-make} clean
+    cd ${BUILD_DIR}
+ fi