Author: glen Date: Thu Jun 21 08:08:01 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- qt 4.3.0 for AC-branch
---- Files affected:
SPECS:
qt4.spec (1.138 -> 1.138.2.1)
---- Diffs:
================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.138 SPECS/qt4.spec:1.138.2.1
--- SPECS/qt4.spec:1.138 Thu Jun 21 01:49:34 2007
+++ SPECS/qt4.spec Thu Jun 21 10:07:56 2007
@@ -16,7 +16,7 @@
%bcond_without sqlite3 # don't build SQLite3 plugin
%bcond_without sqlite # don't build SQLite2 plugin
%bcond_without ibase # don't build ibase (InterBase/Firebird) plugin
-%bcond_without pch # disable pch in qmake
+%bcond_with pch # enable pch in qmake
%bcond_with sse # use SSE instructions in gui/painting module
%bcond_with sse2 # use SSE2 instructions
@@ -85,14 +85,9 @@
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 < %{version}
BuildConflicts: QtCore-devel < %{version}
@@ -203,14 +198,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 +969,6 @@
%patch8 -p1
%patch9 -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}|;
@@ -1631,6 +1617,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.138.2.1 2007/06/21 08:07:56 glen
+- qt 4.3.0 for AC-branch
+
Revision 1.138 2007/06/20 23:49:34 glen
- cosmetics
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.138&r2=1.138.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
