rpms/qt/devel qt.spec,1.202,1.203

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed Aug 6 03:19:29 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7444

Modified Files:
	qt.spec 
Log Message:
since no 4.4.1-1 build exists yet, forward port
* Tue Aug 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-17
- fold -sqlite subpkg into main (#454930)



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- qt.spec	5 Aug 2008 12:25:41 -0000	1.202
+++ qt.spec	6 Aug 2008 03:18:59 -0000	1.203
@@ -144,8 +144,12 @@
 
 Obsoletes: qt4-config < %{version}-%{release}
 Provides: qt4-config = %{version}-%{release}
-## libQtScript Obsoletes libqsa ?
-# Obsoletes: qt4-qsa 
+Obsoletes: qt4-sqlite < %{version}-%{release}
+Provides: qt4-sqlite = %{version}-%{release}
+%if "%{name}" == "qt"
+Obsoletes: qt-sqlite < %{version}-%{release}
+Provides: qt-sqlite = %{version}-%{release}
+%endif
 
 %description 
 Qt is a software toolkit for developing applications.
@@ -239,20 +243,6 @@
 %description postgresql 
 %{summary}.
 
-%package sqlite 
-Summary: SQLite driver for Qt's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: qt4-SQLite < %{version}-%{release}
-Provides:  qt4-SQLite = %{version}-%{release}
-%if "%{name}" != "qt4"
-Obsoletes: qt4-sqlite < %{version}-%{release}
-Provides:  qt4-sqlite = %{version}-%{release}
-%endif
-
-%description sqlite 
-%{summary}.
-
 %package x11
 Summary: Qt GUI-related libraries
 Group: System Environment/Libraries
@@ -606,6 +596,7 @@
 %{_qt4_libdir}/libQtXmlPatterns.so.*
 %dir %{_qt4_plugindir}
 %dir %{_qt4_plugindir}/sqldrivers/
+%{_qt4_plugindir}/sqldrivers/libqsqlite*
 %{_qt4_translationdir}/
 
 %files x11 
@@ -732,17 +723,14 @@
 %{_qt4_plugindir}/sqldrivers/libqsqlmysql*
 %endif
 
-%if "%{?sqlite}" == "-plugin-sql-sqlite"
-%files sqlite 
-%defattr(-,root,root,-)
-%{_qt4_plugindir}/sqldrivers/libqsqlite*
-%endif
-
 
 %changelog
 * Tue Aug 05 2008 Than Ngo <than at redhat.com> -  4.4.1-1
 - 4.4.1
 
+* Tue Aug 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-17
+- fold -sqlite subpkg into main (#454930)
+
 * Wed Jul 23 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-16
 - qt-copy-patches-20080723 (kde#162793)
 - omit deprecated phonon bits




More information about the fedora-extras-commits mailing list