Author: tgoettlicher Date: Fri Apr 27 10:55:14 2012 New Revision: 68032 URL: http://svn.opensuse.org/viewcvs/yast?rev=68032&view=rev Log: gcc47 fix Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/yast2-qt-pkg.spec.in Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=68032&r1=68031&r2=68032&view=diff ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Fri Apr 27 10:55:14 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "23") +SET(VERSION_PATCH "24") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.changes?rev=68032&r1=68031&r2=68032&view=diff ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Fri Apr 27 10:55:14 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 27 10:54:25 CEST 2012 - tgoettlicher@suse.de + +- Workaround for gcc 4.7 issues +- 2.21.24 + +------------------------------------------------------------------- Thu Apr 26 11:03:07 CEST 2012 - tgoettlicher@suse.de - Added package group for unneeded packages Modified: trunk/qt-pkg/yast2-qt-pkg.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/yast2-qt-pkg.spec.in?rev=68032&r1=68031&r2=68032&view=diff ============================================================================== --- trunk/qt-pkg/yast2-qt-pkg.spec.in (original) +++ trunk/qt-pkg/yast2-qt-pkg.spec.in Fri Apr 27 10:55:14 2012 @@ -14,6 +14,12 @@ BuildRequires: yast2-qt-devel >= 2.20.0 BuildRequires: libzypp-devel >= 11.4.0 BuildRequires: yast2-libyui-devel >= 2.20.0 +%if 0%{?force_gcc_46} +BuildRequires: gcc46 +BuildRequires: gcc46-c++ +%else +BuildRequires: gcc-c++ >= 4.6 +%endif Requires: libzypp >= 11.4.0 Requires: yast2-libyui >= 2.20.0 Requires: yast2_theme >= 2.16.1 @@ -31,6 +37,10 @@ %build mkdir build cd build +%if 0%{?force_gcc_46} +export CC=gcc-4.6 +export CXX=g++-4.6 +%endif export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$CFLAGS" cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org