rpms/qt/devel qt-x11-opensource-src-4.5.1-kde4_plugins.patch, 1.1, 1.2 qt.spec, 1.277, 1.278

[Rex Dieter]

Author: rdieter

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

Modified Files:
	qt-x11-opensource-src-4.5.1-kde4_plugins.patch qt.spec 
Log Message:
* Wed May 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-10
- improved kde4_plugins patch, skip expensive/unneeded canonicalPath


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

Index: qt-x11-opensource-src-4.5.1-kde4_plugins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt-x11-opensource-src-4.5.1-kde4_plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qt-x11-opensource-src-4.5.1-kde4_plugins.patch	6 May 2009 19:46:13 -0000	1.1
+++ qt-x11-opensource-src-4.5.1-kde4_plugins.patch	7 May 2009 03:53:43 -0000	1.2
@@ -9,7 +9,7 @@ diff -up qt-x11-opensource-src-4.5.1/src
 +        QString kde4PathPlugins = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + QLatin1String("/kde4/plugins");
 +        if (QFile::exists(kde4PathPlugins)) {
 +            // Make sure we convert from backslashes to slashes.
-+            kde4PathPlugins = QDir(kde4PathPlugins).canonicalPath();
++            // kde4PathPlugins = QDir(kde4PathPlugins).canonicalPath();
 +            if (!app_libpaths->contains(kde4PathPlugins))
 +                app_libpaths->append(kde4PathPlugins);
 +        }


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- qt.spec	6 May 2009 19:46:13 -0000	1.277
+++ qt.spec	7 May 2009 03:53:43 -0000	1.278
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -828,6 +828,9 @@ gtk-update-icon-cache -q %{_datadir}/ico
 
 
 %changelog
+* Wed May 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-10
+- improved kde4_plugins patch, skip expensive/unneeded canonicalPath
+
 * Wed May 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-9
 - include kde4 plugin path by default (#498809)