[qt] fix/respin qdevice_pri patch

Rex Dieter rdieter at fedoraproject.org
Tue Oct 23 21:11:33 UTC 2012


commit 22ea7613bd25480fbf67492b20f8ef51d88ca7dd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 23 16:11:37 2012 -0500

    fix/respin qdevice_pri patch

 ...erywhere-opensource-src-4.8.3-qdevice_pri.patch |    2 +-
 qt.spec                                            |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/qt-everywhere-opensource-src-4.8.3-qdevice_pri.patch b/qt-everywhere-opensource-src-4.8.3-qdevice_pri.patch
index 72ae7f4..183df45 100644
--- a/qt-everywhere-opensource-src-4.8.3-qdevice_pri.patch
+++ b/qt-everywhere-opensource-src-4.8.3-qdevice_pri.patch
@@ -5,7 +5,7 @@ diff -up qt-everywhere-opensource-src-4.8.3/mkspecs/features/device_config.prf.q
  # Load generated qdevice.pri
  isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)
 -isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = . # where to get?
-+isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $[[QT_INSTALL_DATA].
++isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$[QT_INSTALL_DATA]
  
  DEVICE_PRI = $$QT_BUILD_TREE/mkspecs/qdevice.pri
  
diff --git a/qt.spec b/qt.spec
index 78c9b39..4cebc09 100644
--- a/qt.spec
+++ b/qt.spec
@@ -16,7 +16,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.8.3
-Release: 5%{?dist}
+Release: 6%{?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
@@ -1105,6 +1105,9 @@ fi
 
 
 %changelog
+* Tue Oct 23 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.3-6
+- fix/respin qdevice_pri patch
+
 * Mon Oct 22 2012 Rex Dieter <rdieter at fedoraproject.org> 1:4.8.3-5
 - QDir::homePath() should account for an empty $HOME (QTBUG-4862, kde#249217, #694385)
 


More information about the scm-commits mailing list