SPECS (AC-branch): qt4.spec - qt 4.3.2 for AC-branch

[glen]

Author: glen                         Date: Tue Oct 16 05:08:26 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- qt 4.3.2 for AC-branch

---- Files affected:
SPECS:
   qt4.spec (1.144 -> 1.144.2.1) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.144 SPECS/qt4.spec:1.144.2.1
--- SPECS/qt4.spec:1.144	Sun Oct 14 14:05:21 2007
+++ SPECS/qt4.spec	Tue Oct 16 07:08:21 2007
@@ -18,7 +18,7 @@
 # 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_without	pch		# disable pch in qmake
+%bcond_with	pch		# disable pch in qmake
 %bcond_with	sse		# use SSE instructions in gui/painting module
 %bcond_with	sse2		# use SSE2 instructions
 
@@ -86,16 +86,12 @@
 BuildRequires:	sed >= 4.0
 %{?with_sqlite:BuildRequires:	sqlite-devel}
 %{?with_odbc:BuildRequires:	unixODBC-devel}
-BuildRequires:	xorg-lib-libSM-devel
-BuildRequires:	xorg-lib-libXcursor-devel
-BuildRequires:	xorg-lib-libXext-devel
-BuildRequires:	xorg-lib-libXfixes-devel
-BuildRequires:	xorg-lib-libXi-devel
-BuildRequires:	xorg-lib-libXinerama-devel
-BuildRequires:	xorg-lib-libXrandr-devel
-BuildRequires:	xorg-lib-libXrender-devel
+BuildRequires:	xcursor-devel
+BuildRequires:	xft-devel
+BuildRequires:	xrender-devel
 BuildRequires:	zlib-devel
-BuildConflicts:	QtCore-devel < 4.3.2
+BuildConflicts:	QtCore < %{version}
+BuildConflicts:	QtCore-devel < %{version}
 Obsoletes:	qt-extensions
 Obsoletes:	qt-utils
 Conflicts:	kdelibs <= 8:3.2-0.030602.1
@@ -203,14 +199,8 @@
 Requires:	fontconfig-devel
 Requires:	freetype-devel >= 1:2.0.0
 Requires:	libpng-devel >= 2:1.0.8
-Requires:	xorg-lib-libSM-devel
-Requires:	xorg-lib-libXcursor-devel
-Requires:	xorg-lib-libXext-devel
-Requires:	xorg-lib-libXfixes-devel
-Requires:	xorg-lib-libXi-devel
-Requires:	xorg-lib-libXinerama-devel
-Requires:	xorg-lib-libXrandr-devel
-Requires:	xorg-lib-libXrender-devel
+Requires:	xcursor-devel
+Requires:	xrender-devel
 
 %description -n QtGui-devel
 Graphical User Interface components - development files.
@@ -980,9 +970,6 @@
 %patch6 -p1
 %patch7 -p1
 
-%{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
-	mkspecs/common/linux.conf
-
 # change QMAKE FLAGS to build
 %{__sed} -i -e '
 	s|QMAKE_CC.*=.*gcc|QMAKE_CC\t\t= %{__cc}|;
@@ -1641,6 +1628,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.144.2.1  2007/10/16 05:08:21  glen
+- qt 4.3.2 for AC-branch
+
 Revision 1.144  2007/10/14 12:05:21  deejay1
 - BC: Qt < 4.3.2
 - rel. 2
================================================================

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