rpms/qt/devel qt-x11-opensource-src-4.5.1-mysql_config.patch, 1.1, 1.2

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19789

Modified Files:
	qt-x11-opensource-src-4.5.1-mysql_config.patch 
Log Message:
simplify patch a bit, avoiding excessive calls to mysql_config


qt-x11-opensource-src-4.5.1-mysql_config.patch:

Index: qt-x11-opensource-src-4.5.1-mysql_config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt-x11-opensource-src-4.5.1-mysql_config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qt-x11-opensource-src-4.5.1-mysql_config.patch	4 May 2009 13:43:52 -0000	1.1
+++ qt-x11-opensource-src-4.5.1-mysql_config.patch	4 May 2009 14:16:01 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up qt-x11-opensource-src-4.5.1/configure.mysql_config qt-x11-opensource-src-4.5.1/configure
---- qt-x11-opensource-src-4.5.1/configure.mysql_config	2009-05-04 08:30:42.198097263 -0500
-+++ qt-x11-opensource-src-4.5.1/configure	2009-05-04 08:31:22.977827199 -0500
+--- qt-x11-opensource-src-4.5.1/configure.mysql_config	2009-05-04 09:14:37.105826464 -0500
++++ qt-x11-opensource-src-4.5.1/configure	2009-05-04 09:15:26.747077312 -0500
 @@ -4334,6 +4334,7 @@ if [ "$CFG_ACCESSIBILITY" = "auto" ]; th
      CFG_ACCESSIBILITY=yes
  fi
@@ -16,8 +16,8 @@ diff -up qt-x11-opensource-src-4.5.1/con
 +                    $CFG_MYSQL_CONFIG --pkglibdir &>/dev/null && \
 +                      QT_MYSQL_PKGLIBDIR=`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null`
 +                    if [ -n "$QT_MYSQL_PKGLIBDIR" ]; then
-+                    QT_LFLAGS_MYSQL_R="-L`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null` -lmysqlclient_r"
-+                    QT_LFLAGS_MYSQL="-L`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null` -lmysqlclient"
++                    QT_LFLAGS_MYSQL_R="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient_r"
++                    QT_LFLAGS_MYSQL="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient"
 +                    else
                      QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null`
                      QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null`