rpms/qt/F-12 qt.spec,1.337,1.338

[Than Ngo]

Author: than

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

Modified Files:
	qt.spec 
Log Message:
- subpackage sqlite plugin, add Require on qt-sqlite in qt-x11
  for assistant




Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-12/qt.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -p -r1.337 -r1.338
--- qt.spec	14 Oct 2009 18:18:36 -0000	1.337
+++ qt.spec	16 Oct 2009 08:26:03 -0000	1.338
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -203,10 +203,6 @@ Obsoletes: qgtkstyle < 0.1
 Provides:  qgtkstyle = 0.1-1
 Obsoletes: qt4-config < 4.5.0
 Provides: qt4-config = %{version}-%{release}
-Obsoletes: qt4-sqlite < 4.5.0 
-Provides: qt4-sqlite = %{version}-%{release}
-Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}4.5.0
-Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description 
 Qt is a software toolkit for developing applications.
@@ -330,6 +326,17 @@ Provides:  qt4-postgresql = %{version}-%
 %description postgresql 
 %{summary}.
 
+%package sqlite
+Summary: SQLite driver for Qt's SQL classes
+Group: System Environment/Libraries
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: qt4-SQLite < %{version}-%{release}
+Provides:  qt4-SQLite = %{version}-%{release}
+Obsoletes: qt4-sqlite < %{version}-%{release}
+Provides:  qt4-sqlite = %{version}-%{release}
+
+%description sqlite
+%{summary}.
 
 %package x11
 Summary: Qt GUI-related libraries
@@ -347,6 +354,9 @@ Provides:  qt4-phonon = %{version}-%{rel
 Obsoletes: WebKit-qt < 1.0.0-1
 Provides:  WebKit-qt = 1.0.0-1
 %endif
+%if 0%{?sqlite:1}
+Requires: %{name}-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
 Provides: qt4-assistant = %{version}-%{release}
 Provides: %{name}-assistant = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -810,7 +820,6 @@ fi
 %{_qt4_libdir}/libQtXmlPatterns.so.*
 %dir %{_qt4_plugindir}
 %dir %{_qt4_plugindir}/sqldrivers/
-%{_qt4_plugindir}/sqldrivers/libqsqlite*
 %{_qt4_translationdir}/
 
 %if 0%{?demos}
@@ -934,6 +943,12 @@ fi
 %{_qt4_plugindir}/sqldrivers/libqsqlpsql*
 %endif
 
+%if "%{?sqlite}" == "-plugin-sql-sqlite"
+%files sqlite
+%defattr(-,root,root,-)
+%{_qt4_plugindir}/sqldrivers/libqsqlite*
+%endif
+
 %files x11 
 %defattr(-,root,root,-)
 %{_sysconfdir}/rpm/macros.*
@@ -972,6 +987,10 @@ fi
 
 
 %changelog
+* Fri Oct 16 2009 Than Ngo <than at redhat.com> - 4.5.3-6
+- subpackage sqlite plugin, add Require on qt-sqlite in qt-x11
+  for assistant
+
 * Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.3-5
 - drop needless Prereq: /etc/ld.so.conf.d