From 83771cef8ea12103a175d6a5dfc8c79fa72766cf Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 15 Jan 2016 14:36:30 -0600 Subject: [PATCH] allow for bundled harfbuzz,sqlite (el6) --- qt5-qtbase.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 3443c7c..03ca807 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -164,7 +164,9 @@ BuildRequires: pkgconfig(atspi-2) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(glesv2) +%global sqlite -system-sqlite BuildRequires: pkgconfig(sqlite3) >= 3.7 +%global harfbuzz -system-harfbuzz BuildRequires: pkgconfig(harfbuzz) >= 1.0.6 BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(libpcre) >= 8.30 @@ -349,7 +351,10 @@ bin/syncqt.pl -version %{version} # move some bundled libs to ensure they're not accidentally used pushd src/3rdparty mkdir UNUSED -mv freetype libjpeg libpng zlib sqlite UNUSED/ +mv freetype libjpeg libpng zlib UNUSED/ +%if "%{?sqlite}" == "-system-sqlite" +mv sqlite UNUSED/ +%endif %if "%{?xcb}" != "-qt-xcb" mv xcb UNUSED/ %endif @@ -400,11 +405,11 @@ test -x configure || chmod +x configure -no-sse2 \ %endif -no-strip \ - -system-harfbuzz \ -system-libjpeg \ -system-libpng \ - -system-sqlite \ + %{?harfbuzz} \ %{?pcre} \ + %{?sqlite} \ %{?tds} \ %{?xcb} \ %{?xkbcommon} \