Author: tgoettlicher Date: Fri Apr 27 15:26:06 2012 New Revision: 68037 URL: http://svn.opensuse.org/viewcvs/yast?rev=68037&view=rev Log: gcc 4.7 fix Modified: trunk/control-center/VERSION.cmake trunk/control-center/package/yast2-control-center.changes trunk/control-center/yast2-control-center.spec.in Modified: trunk/control-center/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION.cmake?rev=68037&r1=68036&r2=68037&view=diff ============================================================================== --- trunk/control-center/VERSION.cmake (original) +++ trunk/control-center/VERSION.cmake Fri Apr 27 15:26:06 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "22") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-control-center.changes?rev=68037&r1=68036&r2=68037&view=diff ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Fri Apr 27 15:26:06 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 27 15:25:14 CEST 2012 - tgoettlicher@suse.de + +- workaround for gcc 4.7 +- Version: 2.22.2 + +------------------------------------------------------------------- Thu Mar 15 18:29:56 CET 2012 - aschnell@suse.de - added missing include for gcc 4.7 Modified: trunk/control-center/yast2-control-center.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/yast2-control-center.spec.in?rev=68037&r1=68036&r2=68037&view=diff ============================================================================== --- trunk/control-center/yast2-control-center.spec.in (original) +++ trunk/control-center/yast2-control-center.spec.in Fri Apr 27 15:26:06 2012 @@ -7,6 +7,14 @@ BuildRequires: libdrm-devel libjpeg-devel pkgconfig libqt4-devel update-desktop-files yast2-devtools BuildRequires: cmake +%if 0%{?force_gcc_46} +BuildRequires: gcc46 +BuildRequires: gcc46-c++ +%else +BuildRequires: gcc-c++ >= 4.6 +%endif + + Summary: YaST2 - Control Center Requires: yast2 yast2-control-center-binary Provides: y2c_menu y2m_menu yast2-menu @@ -35,6 +43,11 @@ %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