rpms/qt/F-12 qt.spec,1.344,1.345

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1533

Modified Files:
	qt.spec 
Log Message:
* Sat Nov 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.3-10
- -tds: Add package with TDS sqldriver (#537586)
- add arch'd provides for sql drivers



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-12/qt.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -p -r1.344 -r1.345
--- qt.spec	12 Nov 2009 14:26:08 -0000	1.344
+++ qt.spec	15 Nov 2009 00:04:43 -0000	1.345
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -116,6 +116,7 @@ Source31: hi48-app-qt4-logo.png
 %define odbc -plugin-sql-odbc
 %define psql -plugin-sql-psql
 %define sqlite -plugin-sql-sqlite
+%define tds -plugin-sql-tds
 %define phonon -phonon
 %define phonon_backend -phonon-backend
 %if 0%{?rhel}
@@ -206,6 +207,10 @@ BuildRequires: unixODBC-devel
 BuildRequires: sqlite-devel
 %endif
 
+%if "%{?tds}" != "-no-sql-tds"
+BuildRequires: freetds-devel
+%endif
+
 Obsoletes: qgtkstyle < 0.1
 Provides:  qgtkstyle = 0.1-1
 Obsoletes: qt4-config < 4.5.0
@@ -303,6 +308,7 @@ Obsoletes: qt4-MySQL < %{version}-%{rele
 Provides:  qt4-MySQL = %{version}-%{release}
 Obsoletes: qt4-mysql < %{version}-%{release}
 Provides:  qt4-mysql = %{version}-%{release}
+%{?_isa:Provides: qt4-mysql%{?_isa} = %{version}-%{release}}
 
 %description mysql 
 %{summary}.
@@ -316,6 +322,7 @@ Obsoletes: qt4-ODBC < %{version}-%{relea
 Provides:  qt4-ODBC = %{version}-%{release}
 Obsoletes: qt4-odbc < %{version}-%{release}
 Provides:  qt4-odbc = %{version}-%{release}
+%{?_isa:Provides: qt4-odbc%{?_isa} = %{version}-%{release}}
 
 %description odbc 
 %{summary}.
@@ -329,6 +336,7 @@ Obsoletes: qt4-PostgreSQL < %{version}-%
 Provides:  qt4-PostgreSQL = %{version}-%{release}
 Obsoletes: qt4-postgresql < %{version}-%{release}
 Provides:  qt4-postgresql = %{version}-%{release}
+%{?_isa:Provides: qt4-postgresql%{?_isa} = %{version}-%{release}}
 
 %description postgresql 
 %{summary}.
@@ -341,10 +349,22 @@ Obsoletes: qt4-SQLite < %{version}-%{rel
 Provides:  qt4-SQLite = %{version}-%{release}
 Obsoletes: qt4-sqlite < %{version}-%{release}
 Provides:  qt4-sqlite = %{version}-%{release}
+%{?_isa:Provides: qt4-sqlite%{?_isa} = %{version}-%{release}}
 
 %description sqlite
 %{summary}.
 
+%package tds 
+Summary: TDS driver for Qt's SQL classes
+Group: System Environment/Libraries
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: qt4-tds = %{version}-%{release}
+%{?_isa:Provides: qt4-tds%{?_isa} = %{version}-%{release}}
+
+%description tds 
+%{summary}.
+
+
 %package x11
 Summary: Qt GUI-related libraries
 Group: System Environment/Libraries
@@ -525,6 +545,7 @@ done
   %{?psql} \
   %{?odbc} \
   %{?sqlite} %{?_system_sqlite} \
+  %{?tds} \
   %{!?docs:-nomake docs} \
   %{!?demos:-nomake demos} \
   %{!?examples:-nomake examples}
@@ -960,6 +981,12 @@ fi
 %{_qt4_plugindir}/sqldrivers/libqsqlite*
 %endif
 
+%if "%{?tds}" == "-plugin-sql-tds"
+%files tds 
+%defattr(-,root,root,-)
+%{_qt4_plugindir}/sqldrivers/libqsqltds*
+%endif
+
 %files x11 
 %defattr(-,root,root,-)
 %{_sysconfdir}/rpm/macros.*
@@ -998,6 +1025,10 @@ fi
 
 
 %changelog
+* Sat Nov 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.3-10
+- -tds: Add package with TDS sqldriver (#537586)
+- add arch'd provides for sql drivers
+
 * Thu Nov 12 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.5.3-9
 - CVE-2009-3384 - WebKit, ftp listing handling (#525788)
 - CVE-2009-2816 - WebKit, MITM Cross-Origin Resource Sharing (#525789)