rpms/qt/F-9 .cvsignore, 1.32, 1.33 qt.spec, 1.179, 1.180 sources, 1.33, 1.34

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7333

Modified Files:
	.cvsignore qt.spec sources 
Log Message:
revert to 4.4.0 for...

* Tue Aug 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-17
- fold -sqlite subpkg into main (#454930)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	5 Aug 2008 13:25:11 -0000	1.32
+++ .cvsignore	6 Aug 2008 03:16:44 -0000	1.33
@@ -3,5 +3,3 @@
 qt-x11-opensource-src-4.4.0.tar.bz2
 qt-copy-patches-20080711svn.tar.bz2
 qt-copy-patches-20080723svn.tar.bz2
-qt-x11-opensource-src-4.4.1.tar.bz2
-qt-copy-patches-20080805svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- qt.spec	5 Aug 2008 13:25:11 -0000	1.179
+++ qt.spec	6 Aug 2008 03:16:44 -0000	1.180
@@ -7,8 +7,8 @@
 %else
 Name:    qt4
 %endif
-Version: 4.4.1
-Release: 1%{?dist}
+Version: 4.4.0
+Release: 17%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions or QPL
@@ -39,7 +39,7 @@
 Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch
 
 ## qt-copy patches
-%define qt_copy 20080805
+%define qt_copy 20080723
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -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,16 +723,10 @@
 %{_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)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	5 Aug 2008 13:25:11 -0000	1.33
+++ sources	6 Aug 2008 03:16:44 -0000	1.34
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-a94a6f5ef01598bb9980891f2515ff45  qt-x11-opensource-src-4.4.1.tar.bz2
-21597a6486886398a7b771d240ad346b  qt-copy-patches-20080805svn.tar.bz2
+bb7e7e6aa739c0c87e3cb3dbfe0fa814  qt-copy-patches-20080723svn.tar.bz2
+03ee0deb73908c84a7b4d9ceb5f8b3f6  qt-x11-opensource-src-4.4.0.tar.bz2