SPECS: qt.spec - merge update to 3.3.6 from AC-branch

[arekm]

Author: arekm                        Date: Mon Apr  3 18:39:22 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge update to 3.3.6 from AC-branch

---- Files affected:
SPECS:
   qt.spec (1.353 -> 1.354) 

---- Diffs:

================================================================
Index: SPECS/qt.spec
diff -u SPECS/qt.spec:1.353 SPECS/qt.spec:1.354
--- SPECS/qt.spec:1.353	Sun Mar  5 15:26:31 2006
+++ SPECS/qt.spec	Mon Apr  3 20:39:17 2006
@@ -11,7 +11,7 @@
 %bcond_without	pgsql		# don't build PostgreSQL plugin
 %bcond_without	designer	# don't build designer (it takes long)
 %bcond_without	sqlite		# don't build SQLite plugin
-%bcond_without	ibase		# don't build ibase (InterBase/Firebird) plugin
+%bcond_with	ibase		# don't build ibase (InterBase/Firebird) plugin
 %bcond_with	pch		# enable pch in qmake
 #
 %ifnarch %{ix86} %{x8664} sparc sparcv9 alpha ppc
@@ -20,7 +20,7 @@
 %define		_withsql	1
 %{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine _withsql}}}}}
 
-%define		_ver		3.3.5
+%define		_ver		3.3.6
 
 Summary:	The Qt3 GUI application framework
 Summary(es):	Biblioteca para ejecutar aplicaciones GUI Qt
@@ -28,13 +28,13 @@
 Summary(pt_BR):	Estrutura para rodar aplicaçőes GUI Qt
 Name:		qt
 Version:	%{_ver}
-Release:	4
+Release:	1
 Epoch:		6
 License:	GPL/QPL
 Group:		X11/Libraries
 #Source0:	http://ep09.pld-linux.org/~%{_packager}/kde/%{name}-copy-%{_snap}.tar.bz2
 Source0:	ftp://ftp.trolltech.com/qt/source/%{name}-x11-free-%{version}.tar.bz2
-# Source0-md5:	05d04688c0c0230ed54e89102d689ca4
+# Source0-md5:	dc1384c03ac08af21f6fefab32d982cf
 Source1:	http://ftp.pld-linux.org/software/kde/%{name}-copy-patches-040819.tar.bz2
 # Source1-md5:	f35f461463d89f7b035530d8d1f02ad6
 Source2:	%{name}config.desktop
@@ -62,7 +62,6 @@
 Patch13:	%{name}-x11-mono.patch
 Patch14:	%{name}-x11-qfontdatabase_x11.patch
 Patch15:	%{name}-uic_colon_fix.patch
-Patch16:	%{name}-qlistview-takeItem_crash.patch
 URL:		http://www.trolltech.com/products/qt/
 %{?with_ibase:BuildRequires:	Firebird-devel >= 1.5.0}
 BuildRequires:	OpenGL-GLU-devel
@@ -671,7 +670,6 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p0
-%patch16 -p1
 
 install %{SOURCE6} ./apply_patches
 chmod +x ./apply_patches
@@ -679,6 +677,8 @@
 rm patches/0021-qiconview-dragalittle.patch
 # patch 0037 currently applied in 3.3.5 release
 rm patches/0037-dnd-timestamp-fix.patch
+# patch 0051 currently applied in 3.3.6 release
+rm patches/0051-qtoolbar_77047.patch
 ./apply_patches
 rm ../.qt-x11-free-%{version}.applied
 
@@ -1254,6 +1254,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.354  2006/04/03 18:39:17  arekm
+- merge update to 3.3.6 from AC-branch
+
 Revision 1.353  2006/03/05 14:26:31  qboosh
 - switched to modular xorg
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qt.spec?r1=1.353&r2=1.354&f=u