From 1c2241746034285e5d17b81f6785dc7cef463f2e Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kevin@tigcc.ticalc.org>
Date: Mon, 14 Apr 2008 07:29:35 +0000
Subject: [PATCH] Update comps for qt->qt3 and qt4->qt renames, also add the Qt
 4 qt-mysql as optional in "mysql" and qt-odbc, qt3-PostgreSQL and
 qt-postgresql as optional in "sql-server" (PostgreSQL).

---
 comps-f9.xml.in | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/comps-f9.xml.in b/comps-f9.xml.in
index acbf212a..8a402073 100644
--- a/comps-f9.xml.in
+++ b/comps-f9.xml.in
@@ -2611,7 +2611,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">kdelibs-devel</packagereq>
-      <packagereq type="mandatory">qt4-devel</packagereq>
+      <packagereq type="mandatory">qt-devel</packagereq>
       <packagereq type="default">kaider</packagereq>
       <packagereq type="default">kdbg</packagereq>
       <packagereq type="default">kdebase-workspace-devel</packagereq>
@@ -2621,8 +2621,8 @@
       <packagereq type="default">kdesdk</packagereq>
       <packagereq type="default">kdevelop</packagereq>
       <packagereq type="default">PyQt4-devel</packagereq>
-      <packagereq type="default">qt-designer</packagereq>
-      <packagereq type="default">qt-devel</packagereq>
+      <packagereq type="default">qt3-designer</packagereq>
+      <packagereq type="default">qt3-devel</packagereq>
       <packagereq type="optional">gambas</packagereq>
       <packagereq type="optional">kdebase-devel</packagereq>
       <packagereq type="optional">kdebindings-devel</packagereq>
@@ -2953,7 +2953,8 @@
       <packagereq type="optional">mysql-bench</packagereq>
       <packagereq type="optional">mysql-devel</packagereq>
       <packagereq type="optional">php-mysql</packagereq>
-      <packagereq type="optional">qt-MySQL</packagereq>
+      <packagereq type="optional">qt-mysql</packagereq>
+      <packagereq type="optional">qt3-MySQL</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3616,7 +3617,10 @@
       <packagereq type="optional">postgresql-odbc</packagereq>
       <packagereq type="optional">postgresql-tcl</packagereq>
       <packagereq type="optional">postgresql-test</packagereq>
-      <packagereq type="optional">qt-ODBC</packagereq>
+      <packagereq type="optional">qt-odbc</packagereq>
+      <packagereq type="optional">qt3-ODBC</packagereq>
+      <packagereq type="optional">qt-postgresql</packagereq>
+      <packagereq type="optional">qt3-PostgreSQL</packagereq>
       <packagereq type="optional">unixODBC-kde</packagereq>
     </packagelist>
   </group>