summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2011-12-10 16:47:05 +0100
committerRemi Collet <fedora@famillecollet.com>2011-12-10 16:47:05 +0100
commit8fd21f681bfc92f6c8c7bbd31f66728f5eb6d2d7 (patch)
treed62a15bd29a59cec36d08c8e626d68a280622a45
parentadc9d92d0f127bf210391bf34304ffd91bbd750f (diff)
mysql-workbench fix EL6 build
-rw-r--r--mysql-workbench.spec11
1 files changed, 8 insertions, 3 deletions
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 332f236..029bcd0 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -36,7 +36,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pcre-devel >= 3.9
BuildRequires: libglade2-devel >= 2.0.0
BuildRequires: lua-devel >= 5.1
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 12
BuildRequires: ctemplate-devel
%endif
BuildRequires: libgnome-devel >= 2
@@ -124,7 +124,7 @@ and administering MySQL servers.
rm -rf ext/cppconn
%endif
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 12
%patch2 -p1 -b .ctemplate
rm -rf ext/ctemplate
%endif
@@ -154,7 +154,12 @@ touch po/POTFILES.in
%build
NOCONFIGURE=yes ./autogen.sh
export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive"
-%configure --disable-debug --enable-mysql-utilities
+%configure \
+ --disable-debug \
+%if 0%{?fedora} < 12 && 0%{?rhel} < 7
+ --with-bundled-ctemplate \
+%endif
+ --enable-mysql-utilities
make %{?_smp_mflags}