summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2014-05-30 12:32:22 +0200
committerFrançois Andriot <[email protected]>2014-05-30 12:32:22 +0200
commit9814f425f0dae6fa0fb869ef038495df9dd0e588 (patch)
tree55490fb4f5f265c00d9cd14e53628ff01490b4b0 /redhat/dependencies
parentb33e4034e7490e5895a5cb2cc54949354842f9d9 (diff)
downloadtde-packaging-9814f425f0dae6fa0fb869ef038495df9dd0e588.tar.gz
tde-packaging-9814f425f0dae6fa0fb869ef038495df9dd0e588.zip
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/dependencies')
-rw-r--r--redhat/dependencies/sip4-tqt/sip4-tqt.spec6
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec15
2 files changed, 18 insertions, 3 deletions
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index 1eea2f210..8d3a7e8c9 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -28,7 +28,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqtinterface-devel >= %{version}
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
# TDE specific building variables
BuildRequires: python
@@ -116,9 +116,9 @@ python ../configure.py \
-d %{python_sitearch}/sip4_tqt \
-e %{tde_includedir} \
-u STRIP="" \
- CFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3" \
+ CFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3 -I${PWD}/../sipgen" \
CFLAGS_RELEASE="" \
- CXXFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3" \
+ CXXFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3 -I${PWD}/../sipgen" \
CXXFLAGS_RELEASE=""
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index a622c18bc..2cceff38c 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -420,6 +420,20 @@ sqlite driver for TQt 3's SQL classes (QSQL)
##########
+%package sqlite3
+Summary: sqlite3 drivers for TQt 3's SQL classes
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description sqlite3
+sqlite3 driver for TQt 3's SQL classes (QSQL)
+
+%files sqlite3
+%defattr(-,root,root,-)
+%{tde_libdir}/tqt3/plugins/sqldrivers/libqsqlite3.so
+
+##########
+
%if 0%{?with_ibase}
%package ibase
Summary: ibase drivers for TQt 3's SQL classes
@@ -576,6 +590,7 @@ echo yes | ./configure \
-plugin-sql-mysql \
%{?with_ibase:-plugin-sql-ibase} \
-plugin-sql-sqlite \
+ -plugin-sql-sqlite3 \
\
-lfontconfig \
-inputmethod \