SPECS: qt4.spec - modular xorg deps, kill /usr/X11R6 paths

[qboosh]

Author: qboosh                       Date: Sat Feb 18 23:57:40 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- modular xorg deps, kill /usr/X11R6 paths

---- Files affected:
SPECS:
   qt4.spec (1.71 -> 1.72) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.71 SPECS/qt4.spec:1.72
--- SPECS/qt4.spec:1.71	Sun Feb 19 00:52:56 2006
+++ SPECS/qt4.spec	Sun Feb 19 00:57:34 2006
@@ -67,7 +67,7 @@
 %endif
 URL:		http://www.trolltech.com/products/qt/
 %{?with_ibase:BuildRequires:	Firebird-devel}
-BuildRequires:	OpenGL-devel
+BuildRequires:	OpenGL-GLU-devel
 %{?with_sqlite3:BuildRequires:	sqlite3-devel}
 # incompatible with bison
 %{?with_cups:BuildRequires:	cups-devel}
@@ -88,11 +88,14 @@
 BuildRequires:	sed >= 4.0
 %{?with_sqlite:BuildRequires:	sqlite-devel}
 %{?with_odbc:BuildRequires:	unixODBC-devel}
-BuildRequires:	xcursor-devel
-BuildRequires:	xft-devel
-BuildRequires:	xrender-devel
+BuildRequires:	xorg-lib-libSM-devel
+BuildRequires:	xorg-lib-libXcursor-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXi-devel
+BuildRequires:	xorg-lib-libXinerama-devel
+BuildRequires:	xorg-lib-libXrandr-devel
+BuildRequires:	xorg-lib-libXrender-devel
 BuildRequires:	zlib-devel
-Requires:	OpenGL
 Obsoletes:	qt-extensions
 Obsoletes:	qt-utils
 Conflicts:	kdelibs <= 8:3.2-0.030602.1
@@ -196,6 +199,13 @@
 Requires:	freetype-devel >= 1:2.0.0
 Requires:	fontconfig-devel
 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-libXi-devel
+Requires:	xorg-lib-libXinerama-devel
+Requires:	xorg-lib-libXrandr-devel
+Requires:	xorg-lib-libXrender-devel
 Requires:	xcursor-devel
 Requires:	xrender-devel
 
@@ -270,7 +280,7 @@
 Summary:	OpenGL support classes - development files
 Summary(pl):	Klasy wspomagające OpenGL - pliki programistyczne
 Group:		X11/Development/Libraries
-Requires:	OpenGL-devel
+Requires:	OpenGL-GLU-devel
 Requires:	QtCore-devel = %{version}-%{release}
 Requires:	QtOpenGL = %{version}-%{release}
 
@@ -829,6 +839,8 @@
 %patch10 -p1
 %endif
 
+sed -i -e 's,usr/X11R6/,usr/,' mkspecs/linux-g*/qmake.conf
+
 # change QMAKE_CFLAGS_RELEASE to build
 # properly optimized libs
 
@@ -1391,6 +1403,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72  2006/02/18 23:57:34  qboosh
+- modular xorg deps, kill /usr/X11R6 paths
+
 Revision 1.71  2006/02/18 23:52:56  qboosh
 - sorted some configured options, removed self buildconflicts
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.71&r2=1.72&f=u