Hello community, here is the log from the commit of package qt3 checked in at Thu Dec 6 01:57:58 CET 2007. -------- --- KDE/qt3/qt3.changes 2007-12-03 15:13:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/qt3/qt3.changes 2007-12-06 01:32:57.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 6 01:32:32 CET 2007 - dmueller@suse.de + +- fix the build key for gcc 4.3 + +------------------------------------------------------------------- qt3-extensions.changes: same change qt3-static.changes: same change New: ---- 0085-fix-buildkey.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.Wx2964/_old 2007-12-06 01:56:14.000000000 +0100 +++ /var/tmp/diff_new_pack.Wx2964/_new 2007-12-06 01:56:14.000000000 +0100 @@ -18,7 +18,7 @@ Summary: Documentation for the Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.8 -Release: 98 +Release: 99 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -98,6 +98,7 @@ Patch130: CVE-2007-4137.diff Patch131: 0082-fix-qdatetime-fromstring.diff Patch132: revert-qt-3.3.8-khmer-fix.diff +Patch133: 0085-fix-buildkey.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -179,6 +180,7 @@ %patch130 %patch131 %patch132 +%patch133 # copy qt kde integration files cp %SOURCE100 %SOURCE101 src/kernel/ cp %SOURCE101 include/private/ ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.Wx2964/_old 2007-12-06 01:56:14.000000000 +0100 +++ /var/tmp/diff_new_pack.Wx2964/_new 2007-12-06 01:56:14.000000000 +0100 @@ -17,7 +17,7 @@ %endif License: GPL v2 only; THE Q PUBLIC LICENSE (QPL) Version: 3.3.8 -Release: 98 +Release: 99 AutoReqProv: on Requires: qt3 = %version Group: Development/Tools/Other @@ -96,6 +96,7 @@ Patch130: CVE-2007-4137.diff Patch131: 0082-fix-qdatetime-fromstring.diff Patch132: revert-qt-3.3.8-khmer-fix.diff +Patch133: 0085-fix-buildkey.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -175,6 +176,7 @@ %patch130 %patch131 %patch132 +%patch133 # copy qt kde integration files cp %SOURCE100 %SOURCE101 src/kernel/ cp %SOURCE101 include/private/ ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.Wx2964/_old 2007-12-06 01:56:14.000000000 +0100 +++ /var/tmp/diff_new_pack.Wx2964/_new 2007-12-06 01:56:14.000000000 +0100 @@ -19,7 +19,7 @@ AutoReqProv: on Summary: A library for developing applications with graphical user interfaces Version: 3.3.8 -Release: 98 +Release: 99 Provides: qt_library_%version PreReq: /bin/grep %define x11_free -x11-free- @@ -95,6 +95,7 @@ Patch130: CVE-2007-4137.diff Patch131: 0082-fix-qdatetime-fromstring.diff Patch132: revert-qt-3.3.8-khmer-fix.diff +Patch133: 0085-fix-buildkey.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -183,6 +184,7 @@ %patch130 %patch131 %patch132 +%patch133 # copy qt kde integration files cp %SOURCE100 %SOURCE101 src/kernel/ cp %SOURCE101 include/private/ @@ -387,6 +389,8 @@ /etc/profile.d/qt3.* %changelog +* Thu Dec 06 2007 - dmueller@suse.de +- fix the build key for gcc 4.3 * Mon Dec 03 2007 - dmueller@suse.de - back out khmer "fix" from 3.3.8, which apparently made it worse (#345459) ++++++ qt3-static.spec ++++++ --- /var/tmp/diff_new_pack.Wx2964/_old 2007-12-06 01:56:14.000000000 +0100 +++ /var/tmp/diff_new_pack.Wx2964/_new 2007-12-06 01:56:14.000000000 +0100 @@ -17,7 +17,7 @@ AutoReqProv: on Summary: Static library for developing GUI applications Version: 3.3.8 -Release: 98 +Release: 99 %define x11_free -x11-free- %define rversion %version # COMMON-BEGIN @@ -92,6 +92,7 @@ Patch130: CVE-2007-4137.diff Patch131: 0082-fix-qdatetime-fromstring.diff Patch132: revert-qt-3.3.8-khmer-fix.diff +Patch133: 0085-fix-buildkey.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -182,6 +183,7 @@ %patch130 %patch131 %patch132 +%patch133 # copy qt kde integration files cp %SOURCE100 %SOURCE101 src/kernel/ cp %SOURCE101 include/private/ ++++++ 0085-fix-buildkey.diff ++++++ --- configure +++ configure @@ -3140,15 +3140,15 @@ case "$COMPILER" in 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.*) + 4.*) COMPILER_VERSION="4" ;; *) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org