rpms/kdelibs
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fri Dec 10 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.5.85-3

Browse Source 
- fix FindQt4.cmake when there's also qt3-devel installed (#661996)
This commit is contained in:
Kevin Kofler 2010-12-10 18:37:42 +01:00
parent a5d39bb4fc
commit 9d96f580c2
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kdelibs-4.5.85-#661996.patch Normal file
View File

@ -0,0 +1,22 @@
Index: cmake/modules/FindQt4.cmake
===================================================================
--- cmake/modules/FindQt4.cmake (revision 1205273)
+++ cmake/modules/FindQt4.cmake (revision 1205274)
@@ -467,7 +467,7 @@
_qt4_query_qmake(QT_VERSION QTVERSION)
# check for qt3 qmake and then try and find qmake4 or qmake-qt4 in the path
- IF("${QTVERSION}" MATCHES "Unknown")
+ IF(NOT QTVERSION)
SET(QT_QMAKE_EXECUTABLE NOTFOUND CACHE FILEPATH "" FORCE)
FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
@@ -478,7 +478,7 @@
IF(QT_QMAKE_EXECUTABLE)
_qt4_query_qmake(QT_VERSION QTVERSION)
ENDIF(QT_QMAKE_EXECUTABLE)
- ENDIF("${QTVERSION}" MATCHES "Unknown")
+ ENDIF(NOT QTVERSION)
# check that we found the Qt4 qmake, Qt3 qmake output won't match here
STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" qt_version_tmp "${QTVERSION}")

12
kdelibs.spec
View File

@ -16,7 +16,7 @@
Summary: KDE Libraries
Version: 4.5.85
Release: 2%{?dist}
Release: 3%{?dist}
Name: kdelibs
Epoch: 6
@ -92,8 +92,10 @@ Patch27: kdelibs-4.5.80-no_rpath.patch
# TODO: try to use either gpg or gpg2, whichever is available
Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
## 4.6 upstream
## trunk upstream
## trunk (4.6) upstream
# http://websvn.kde.org/?view=revision&revision=1205274
# fix FindQt4.cmake when there's also qt3-devel installed (#661996)
Patch100: kdelibs-4.5.85-#661996.patch
## security fix
# Not Upstreamed? why not ? -- Rex
@ -274,6 +276,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch50 -p1 -b .knewstuff_gpg2
# upstream patches
%patch100 -p0 -b .#661996
# security fix
%patch200 -p1 -b .CVE-2009-2702
@ -526,6 +529,9 @@ rm -rf %{buildroot}
%changelog
* Fri Dec 10 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.5.85-3
- fix FindQt4.cmake when there's also qt3-devel installed (#661996)
* Wed Dec 08 2010 Thomas Janssen <thomasj@fedoraproject.org> 4.5.85-2
- respun upstream tarball