[qt3] add rhel7 condition
Than Ngo
than at fedoraproject.org
Thu Dec 1 22:18:47 UTC 2011
commit 7b86d1304348b30af77d263877fd8cecc5e33e1c
Author: Than Ngo <than at redhat.com>
Date: Thu Dec 1 23:18:40 2011 +0100
add rhel7 condition
qt3.spec | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/qt3.spec b/qt3.spec
index 33e7add..8397120 100644
--- a/qt3.spec
+++ b/qt3.spec
@@ -138,8 +138,9 @@ BuildRequires: desktop-file-utils
BuildRequires: mysql-devel
BuildRequires: postgresql-devel
BuildRequires: unixODBC-devel
+%if 0%{?fedora} || 0%{?rhel} < 7
BuildRequires: sqlite2-devel
-
+%endif
%package config
Summary: Graphical configuration tool for programs using Qt 3
@@ -408,10 +409,12 @@ echo yes | ./configure \
make $SMP_MFLAGS src-qmake
+%if 0%{?fedora} || 0%{?rhel} < 7
# build sqlite plugin
pushd plugins/src/sqldrivers/sqlite
qmake -o Makefile sqlite.pro
popd
+%endif
# build psql plugin
pushd plugins/src/sqldrivers/psql
@@ -580,9 +583,11 @@ rm -rf %{buildroot}
%doc tutorial
%{_mandir}/*/*
+%if 0%{?fedora} || 0%{?rhel} < 7
%files sqlite
%defattr(-,root,root,-)
%{qtdir}/plugins/sqldrivers/libqsqlite.so
+%endif
%files ODBC
%defattr(-,root,root,-)
@@ -605,6 +610,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Dec 01 2011 Than Ngo <than at redhat.com> - 3.3.8b-38
+- add rhel7 condition
+
* Fri Nov 04 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.3.8b-37
- fix aliasing issue in qlocale.cpp
- build against the system sqlite2-devel (patch from Debian)
More information about the scm-commits
mailing list