SPECS: qt4.spec - added ibase patch, ibase enabled again - reverte...

[qboosh]

Author: qboosh                       Date: Thu Aug 30 05:24:50 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added ibase patch, ibase enabled again
- reverted reverting dropping QtCore BC (issue resolved)
- seems to build fine with Qt*-devel 4.3 installed

---- Files affected:
SPECS:
   qt4.spec (1.140 -> 1.141) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.140 SPECS/qt4.spec:1.141
--- SPECS/qt4.spec:1.140	Thu Aug 16 22:50:34 2007
+++ SPECS/qt4.spec	Thu Aug 30 07:24:45 2007
@@ -17,8 +17,7 @@
 %bcond_without	sqlite		# don't build SQLite2 plugin
 # Disabled because of bug in 4.3.1 - (can't build odbc and ibase at once).
 # Should be fixed in 4.3.2 (or by some patch eariler) - just temporary workaround.
-#%bcond_without	ibase		# don't build ibase (InterBase/Firebird) plugin
-%bcond_with	ibase		# don't build ibase (InterBase/Firebird) plugin
+%bcond_without	ibase		# don't build ibase (InterBase/Firebird) plugin
 %bcond_without	pch		# disable pch in qmake
 %bcond_with	sse		# use SSE instructions in gui/painting module
 %bcond_with	sse2		# use SSE2 instructions
@@ -58,7 +57,7 @@
 Patch1:		%{name}-qt_copy.patch
 Patch2:		%{name}-buildsystem.patch
 Patch3:		%{name}-locale.patch
-
+Patch4:		%{name}-ibase.patch
 Patch6:		%{name}-antialias.patch
 Patch7:		%{name}-support-cflags-with-commas.patch
 Patch8:		%{name}-build-lib-static.patch
@@ -97,8 +96,7 @@
 BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-lib-libXrender-devel
 BuildRequires:	zlib-devel
-BuildConflicts:	QtCore < %{version}
-BuildConflicts:	QtCore-devel < %{version}
+BuildConflicts:	QtCore-devel < 4.3
 Obsoletes:	qt-extensions
 Obsoletes:	qt-utils
 Conflicts:	kdelibs <= 8:3.2-0.030602.1
@@ -978,6 +976,7 @@
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -1634,6 +1633,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.141  2007/08/30 05:24:45  qboosh
+- added ibase patch, ibase enabled again
+- reverted reverting dropping QtCore BC (issue resolved)
+- seems to build fine with Qt*-devel 4.3 installed
+
 Revision 1.140  2007/08/16 20:50:34  pascalek
 - updated to 4.3.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qt4.spec?r1=1.140&r2=1.141&f=u