Removed workaround for gcc 4.7 issues

libyui · Jun 20, 2012 · f2bf5fe · f2bf5fe
1 parent 5fc2b86
commit f2bf5fe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/VERSION.cmake b/VERSION.cmake
@@ -1,3 +1,3 @@
 SET(VERSION_MAJOR "2")
 SET(VERSION_MINOR "21")
-SET(VERSION_PATCH "24")
+SET(VERSION_PATCH "25")
diff --git a/package/yast2-qt-pkg.changes b/package/yast2-qt-pkg.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 20 15:26:36 CEST 2012 - tgoettlicher@suse.de
+
+- Removed workaround for gcc 4.7 issues
+- 2.21.25
+
 -------------------------------------------------------------------
 Fri Apr 27 10:54:25 CEST 2012 - tgoettlicher@suse.de
 

diff --git a/yast2-qt-pkg.spec.in b/yast2-qt-pkg.spec.in
@@ -14,12 +14,6 @@ Requires:	yast2-qt       >= 2.20.0
 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
@@ -37,10 +31,6 @@ X Window System.
 %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} \