From e88754810cc23f52f82337cac7a048efd32ff96b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 7 Mar 2014 10:13:14 -0600 Subject: [PATCH] respin mysql_config patch --- ...verywhere-opensource-src-4.8.5-mysql_config.patch | 12 ++++++------ qt.spec | 7 +++++-- 2 files changed, 11 insertions(+), 8 deletions(-) rename qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch => qt-everywhere-opensource-src-4.8.5-mysql_config.patch (59%) diff --git a/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch b/qt-everywhere-opensource-src-4.8.5-mysql_config.patch similarity index 59% rename from qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch rename to qt-everywhere-opensource-src-4.8.5-mysql_config.patch index 47c066b..fc0ee76 100644 --- a/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch +++ b/qt-everywhere-opensource-src-4.8.5-mysql_config.patch @@ -1,12 +1,12 @@ -diff -up qt-everywhere-opensource-src-4.7.0-beta2/configure.mysql_config qt-everywhere-opensource-src-4.7.0-beta2/configure ---- qt-everywhere-opensource-src-4.7.0-beta2/configure.mysql_config 2010-06-29 20:53:10.000000000 -0500 -+++ qt-everywhere-opensource-src-4.7.0-beta2/configure 2010-07-08 08:30:32.148864934 -0500 -@@ -4849,8 +4849,15 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do +diff -up qt-everywhere-opensource-src-4.8.5/configure.mysql_config qt-everywhere-opensource-src-4.8.5/configure +--- qt-everywhere-opensource-src-4.8.5/configure.mysql_config 2013-06-07 00:16:41.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.5/configure 2014-03-07 10:09:27.412071146 -0600 +@@ -5480,8 +5480,15 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do [ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`"$WHICH" mysql_config` if [ -x "$CFG_MYSQL_CONFIG" ]; then QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null` -+ $CFG_MYSQL_CONFIG --pkglibdir &>/dev/null && \ -+ QT_MYSQL_PKGLIBDIR=`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null` ++ $CFG_MYSQL_CONFIG --variable=pkglibdir &>/dev/null && \ ++ QT_MYSQL_PKGLIBDIR=`$CFG_MYSQL_CONFIG --variable=pkglibdir 2>/dev/null` + if [ -n "$QT_MYSQL_PKGLIBDIR" ]; then + QT_LFLAGS_MYSQL_R="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient_r" + QT_LFLAGS_MYSQL="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient" diff --git a/qt.spec b/qt.spec index b824ea7..b882382 100644 --- a/qt.spec +++ b/qt.spec @@ -25,7 +25,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.8.5 -Release: 21%{?dist} +Release: 22%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT @@ -89,7 +89,7 @@ Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch # fix invalid assumptions about mysql_config --libs # http://bugzilla.redhat.com/440673 -Patch54: qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch +Patch54: qt-everywhere-opensource-src-4.8.5-mysql_config.patch # http://bugs.kde.org/show_bug.cgi?id=180051#c22 Patch55: qt-everywhere-opensource-src-4.6.2-cups.patch @@ -1248,6 +1248,9 @@ fi %changelog +* Fri Mar 07 2014 Rex Dieter 4.8.5-22 +- respin mysql_config patch + * Fri Mar 07 2014 Rex Dieter 4.8.5-21 - restore qt-cupsEnumDests.patch (#980952)