[qt3] add rhel7 condition

Than Ngo than at fedoraproject.org
Thu Dec 1 23:02:27 UTC 2011


commit ecf07a2081839e914972de67ed7c739966e09a01
Author: Than Ngo <than at redhat.com>
Date:   Fri Dec 2 00:02:17 2011 +0100

    add rhel7 condition

 qt3.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/qt3.spec b/qt3.spec
index eac9e66..d378798 100644
--- a/qt3.spec
+++ b/qt3.spec
@@ -97,7 +97,11 @@ Patch201: qt-x11-free-3.3.8b-gcc43.patch
 %define plugin_odbc -plugin-sql-odbc
 
 # sqlite plugins
+%if 0%{?rhel} < 7
 %define plugin_sqlite -plugin-sql-sqlite
+%else
+%define plugin_sqlite %{nil}
+%endif
 
 %define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng
 %define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style}
@@ -138,7 +142,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: mysql-devel
 BuildRequires: postgresql-devel
 BuildRequires: unixODBC-devel
-%if 0%{?fedora} || 0%{?rhel} < 7
+%if 0%{?rhel} < 7
 BuildRequires: sqlite2-devel
 %endif
 
@@ -409,7 +413,7 @@ echo yes | ./configure \
 
 make $SMP_MFLAGS src-qmake
 
-%if 0%{?fedora} || 0%{?rhel} < 7
+%if 0%{?rhel} < 7
 # build sqlite plugin
 pushd plugins/src/sqldrivers/sqlite
 qmake -o Makefile sqlite.pro
@@ -583,7 +587,7 @@ rm -rf %{buildroot}
 %doc tutorial
 %{_mandir}/*/*
 
-%if 0%{?fedora} || 0%{?rhel} < 7
+%if 0%{?rhel} < 7
 %files sqlite
 %defattr(-,root,root,-)
 %{qtdir}/plugins/sqldrivers/libqsqlite.so


More information about the scm-commits mailing list