Author: glen Date: Fri Oct 22 11:03:49 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- use $QMAKE not qmake bin, to always use QMAKE configured
---- Files affected:
packages/bacula:
bacula.spec (1.163 -> 1.164) , qmake-bin.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/bacula/bacula.spec
diff -u packages/bacula/bacula.spec:1.163 packages/bacula/bacula.spec:1.164
--- packages/bacula/bacula.spec:1.163 Fri Oct 15 08:21:57 2010
+++ packages/bacula/bacula.spec Fri Oct 22 13:03:40 2010
@@ -58,6 +58,7 @@
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
@@ -473,6 +474,7 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
@@ -1063,6 +1065,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.164 2010/10/22 11:03:40 glen
+- use $QMAKE not qmake bin, to always use QMAKE configured
+
Revision 1.163 2010/10/15 06:21:57 glen
- release 7
================================================================
Index: packages/bacula/qmake-bin.patch
diff -u /dev/null packages/bacula/qmake-bin.patch:1.1
--- /dev/null Fri Oct 22 13:03:49 2010
+++ packages/bacula/qmake-bin.patch Fri Oct 22 13:03:40 2010
@@ -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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula.spec?r1=1.163&r2=1.164&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
