[odb] Merging in changes from EPEL (no changes to build on Fedora)

[Dave Johansen]

commit 0bf895ef0fe0aff8f8a91b0ae8b8134e97109ff9
Author: Dave Johansen <davejohansen at gmail.com>
Date:   Sat Jul 19 16:19:11 2014 -0700

    Merging in changes from EPEL (no changes to build on Fedora)

 odb.spec |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/odb.spec b/odb.spec
index 34f5325..44afa77 100644
--- a/odb.spec
+++ b/odb.spec
@@ -25,12 +25,9 @@ BuildRequires: gcc-c++ >= 4.5.0
 BuildRequires: gcc-plugin-devel
 %else
 # Otherwise, use devtoolset on RHEL 5/6 because it supports plugins
-BuildRequires: devtoolset-1.1-binutils
-BuildRequires: devtoolset-1.1-gcc-c++
-BuildRequires: devtoolset-1.1-gcc-plugin-devel
-# Also list gmp-devel since devtoolset-gcc-plugin-devel should list it as a requirement but doesn't
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=908577
-BuildRequires: gmp-devel
+BuildRequires: devtoolset-2-binutils
+BuildRequires: devtoolset-2-gcc-c++
+BuildRequires: devtoolset-2-gcc-plugin-devel
 %endif
 # Uses libcutl from Code Synthesis
 BuildRequires: libcutl-devel >= 1.8.0
@@ -61,7 +58,6 @@ columns, or SQL and without manually writing any of the mapping code.
 %setup -q
 %patch1 -p1
 # Set the path to the default.options file
-#define
 %define odb_default_options_dir %{_sysconfdir}/%{name}
 %define odb_default_options_file %{odb_default_options_dir}/default.options
 
@@ -69,7 +65,7 @@ columns, or SQL and without manually writing any of the mapping code.
 %build
 confopts="--disable-static --with-options-file=%{odb_default_options_file}"
 # If building on Fedora 21
-%if 0%{?rhel}%{?fedora} >= 21
+%if "%{gcc_version}" == "4.9.0"
 # gcc 4.9.0 has a de-virtualization bug
 # See: http://codesynthesis.com/pipermail/odb-users/2014-May/001865.html
 export CXXFLAGS="$RPM_OPT_FLAGS -fno-devirtualize"
@@ -77,10 +73,10 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-devirtualize"
 # If building on RHEL 5/6
 %if 0%{?rhel}%{?fedora} <= 6
 # Otherwise, use devtoolset on RHEL 5/6 to get a version of gcc that supports plugins
-source /opt/rh/devtoolset-1.1/enable
+source /opt/rh/devtoolset-2/enable
 # Add the explicit linking of pthread library because of a toolchain issue
 # See: http://www.codesynthesis.com/pipermail/odb-users/2013-February/001103.html
-confopts="$confopts LIBS=\"-lpthread\""
+confopts="$confopts LIBS=-lpthread"
 %endif
 %configure $confopts
 make %{?_smp_mflags}
@@ -145,6 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+- Build against devtoolset 2.0
 
 * Wed May 28 2014 Dave Johansen <davejohansen at gmail.com> 2.3.0-2
 - Adding expat-devel as BuildRequires