rpms/qt/devel qt-x11-free-3.3.8b-gcc4-buildkey.patch, NONE, 1.1 qt.spec, 1.155, 1.156 qt-x11-free-3.3.5-gcc4-buildkey.patch, 1.1, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18175/devel

Modified Files:
	qt.spec 
Added Files:
	qt-x11-free-3.3.8b-gcc4-buildkey.patch 
Removed Files:
	qt-x11-free-3.3.5-gcc4-buildkey.patch 
Log Message:
* Mon Feb 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.3.8b-5
- fix buildkey for GCC 4.3

qt-x11-free-3.3.8b-gcc4-buildkey.patch:

--- NEW FILE qt-x11-free-3.3.8b-gcc4-buildkey.patch ---
diff -ur qt-x11-free-3.3.8b/configure qt-x11-free-3.3.8b-gcc4-buildkey/configure
--- qt-x11-free-3.3.8b/configure	2008-01-15 20:09:15.000000000 +0100
+++ qt-x11-free-3.3.8b-gcc4-buildkey/configure	2008-02-18 02:41:01.000000000 +0100
@@ -3081,16 +3081,16 @@
 g++*)
     # GNU C++
     QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"`
-    COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null`
+    COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null | sed 's,^[^0-9]*,,g'`
     case "$COMPILER_VERSION" in
-    *2.95.*)
+    2.95.*)
 	COMPILER_VERSION="2.95.*"
 	;;
-    *3.*)
+    3.*)
 	COMPILER_VERSION="3.*"
 	;;
-    *4.*)
-	COMPILER_VERSION="4"
+    4.*)
+	COMPILER_VERSION="4.*"
 	;;
     *)
 	;;


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- qt.spec	16 Feb 2008 08:57:17 -0000	1.155
+++ qt.spec	18 Feb 2008 11:03:02 -0000	1.156
@@ -1,7 +1,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: 3.3.8b
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: QPL or GPLv2 or GPLv3
 Group: System Environment/Libraries
@@ -26,7 +26,7 @@
 Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch
 Patch14: qt-x11-free-3.3.3-gl.patch
 Patch19: qt-3.3.3-gtkstyle.patch 
-Patch20: qt-x11-free-3.3.5-gcc4-buildkey.patch
+Patch20: qt-x11-free-3.3.8b-gcc4-buildkey.patch
 Patch24: qt-x11-free-3.3.5-uic.patch
 Patch25: qt-x11-free-3.3.8b-uic-multilib.patch
 Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch
@@ -574,6 +574,9 @@
 
 
 %changelog
+* Mon Feb 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.3.8b-5
+- fix buildkey for GCC 4.3
+
 * Mon Feb 11 2008 Than Ngo <than at redhat.com> 3.3.8b-4
 - rebuild for GCC 4.3
 


--- qt-x11-free-3.3.5-gcc4-buildkey.patch DELETED ---