rpms/qt/devel qt-everywhere-opensource-src-4.6.0-beta1-qdoc3.patch, NONE, 1.1 qt.spec, 1.346, 1.347 qt-x11-opensource-src-4.5.0-qdoc3.patch, 1.2, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5423

Modified Files:
	qt.spec 
Added Files:
	qt-everywhere-opensource-src-4.6.0-beta1-qdoc3.patch 
Removed Files:
	qt-x11-opensource-src-4.5.0-qdoc3.patch 
Log Message:
* Fri Oct 16 2009 Than Ngo <than at redhat.com> - 4.6.0-0.2.beta1 
- subpackage sqlite plugin, add Require on qt-sqlite in qt-x11
  for assistant
- build/install qdoc3 again


qt-everywhere-opensource-src-4.6.0-beta1-qdoc3.patch:
 qdoc3/qdoc3.pro |    3 +++
 tools.pro       |    1 +
 2 files changed, 4 insertions(+)

--- NEW FILE qt-everywhere-opensource-src-4.6.0-beta1-qdoc3.patch ---
diff -up qt-everywhere-opensource-src-4.6.0-beta1/tools/qdoc3/qdoc3.pro.qdoc3 qt-everywhere-opensource-src-4.6.0-beta1/tools/qdoc3/qdoc3.pro
--- qt-everywhere-opensource-src-4.6.0-beta1/tools/qdoc3/qdoc3.pro.qdoc3	2009-10-13 10:34:08.000000000 -0500
+++ qt-everywhere-opensource-src-4.6.0-beta1/tools/qdoc3/qdoc3.pro	2009-10-16 14:55:27.024789581 -0500
@@ -105,3 +105,6 @@ SOURCES += apigenerator.cpp \
            webxmlgenerator.cpp \
 	   yyindent.cpp
 
+TARGET= qdoc3
+target.path = $$[QT_INSTALL_BINS]
+INSTALLS += target
diff -up qt-everywhere-opensource-src-4.6.0-beta1/tools/tools.pro.qdoc3 qt-everywhere-opensource-src-4.6.0-beta1/tools/tools.pro
--- qt-everywhere-opensource-src-4.6.0-beta1/tools/tools.pro.qdoc3	2009-10-13 10:34:08.000000000 -0500
+++ qt-everywhere-opensource-src-4.6.0-beta1/tools/tools.pro	2009-10-16 14:57:49.699789384 -0500
@@ -14,6 +14,7 @@ no-png {
          SUBDIRS += designer
      }
      SUBDIRS     += linguist
+     SUBDIRS     += qdoc3
      symbian: SUBDIRS = designer
      wince*: SUBDIRS = qtestlib designer
      unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -p -r1.346 -r1.347
--- qt.spec	14 Oct 2009 20:12:03 -0000	1.346
+++ qt.spec	16 Oct 2009 23:00:14 -0000	1.347
@@ -14,7 +14,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.6.0
-Release: 0.1.%{pre}%{?dist}
+Release: 0.2.%{pre}%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -54,7 +54,7 @@ Patch23: qt-x11-opensource-src-4.5.3-jav
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
-Patch51: qt-x11-opensource-src-4.5.0-qdoc3.patch
+Patch51: qt-everywhere-opensource-src-4.6.0-beta1-qdoc3.patch 
 Patch52: qt-4.5-sparc64.patch
 # fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
@@ -188,10 +188,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.
@@ -315,6 +311,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
@@ -332,6 +339,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}
@@ -364,9 +374,7 @@ Qt libraries used for drawing widgets an
 ## FIXME: I think this one can be replaced with ./configure -no-javascript-jit
 ## test first if it's still needed
 #patch23 -p1 -b .javascriptcore-disable-jit
-## FIXME: qdoc3 was needed for older qt-creator builds, but it seems
-## it's not needed anymore
-#patch51 -p1 -b .qdoc3
+%patch51 -p1 -b .qdoc3
 ## FIXME: port patch
 #patch52 -p1 -b .sparc64
 ## TODO: still worth carrying?  if so, upstream it.
@@ -785,7 +793,6 @@ fi
 %{_qt4_libdir}/libQtXmlPatterns.so.4*
 %dir %{_qt4_plugindir}
 %dir %{_qt4_plugindir}/sqldrivers/
-%{_qt4_plugindir}/sqldrivers/libqsqlite*
 %{_qt4_translationdir}/
 
 %if 0%{?demos}
@@ -913,6 +920,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.*
@@ -952,6 +965,11 @@ fi
 
 
 %changelog
+* Fri Oct 16 2009 Than Ngo <than at redhat.com> - 4.6.0-0.2.beta1 
+- subpackage sqlite plugin, add Require on qt-sqlite in qt-x11
+  for assistant
+- build/install qdoc3 again
+
 * Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.6.0-0.1.beta1
 - qt-4.6.0-beta1
 - no kde-qt patches (yet)


--- qt-x11-opensource-src-4.5.0-qdoc3.patch DELETED ---