SPECS: qt.spec - switched to modular xorg

[qboosh]

Author: qboosh                       Date: Sun Mar  5 14:26:37 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- switched to modular xorg

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

---- Diffs:

================================================================
Index: SPECS/qt.spec
diff -u SPECS/qt.spec:1.352 SPECS/qt.spec:1.353
--- SPECS/qt.spec:1.352	Sun Mar  5 08:59:00 2006
+++ SPECS/qt.spec	Sun Mar  5 15:26:31 2006
@@ -65,7 +65,7 @@
 Patch16:	%{name}-qlistview-takeItem_crash.patch
 URL:		http://www.trolltech.com/products/qt/
 %{?with_ibase:BuildRequires:	Firebird-devel >= 1.5.0}
-BuildRequires:	OpenGL-devel
+BuildRequires:	OpenGL-GLU-devel
 %{?with_cups:BuildRequires:	cups-devel}
 BuildRequires:	flex
 BuildRequires:	freetype-devel >= 1:2.0.0
@@ -84,9 +84,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-libXinerama-devel
+BuildRequires:	xorg-lib-libXft-devel
+BuildRequires:	xorg-lib-libXmu-devel
+BuildRequires:	xorg-lib-libXrandr-devel
+BuildRequires:	xorg-lib-libXrender-devel
 BuildRequires:	zlib-devel
 Requires:	freetype >= 1:2.0.0
 Requires:	libmng >= 1.0.0
@@ -174,9 +179,14 @@
 Requires:	libmng-devel >= 1.0.0
 Requires:	libpng-devel
 Requires:	libstdc++-devel
-Requires:	xcursor-devel
-Requires:	xft-devel
-Requires:	xrender-devel
+Requires:	xorg-lib-libSM-devel
+Requires:	xorg-lib-libXcursor-devel
+Requires:	xorg-lib-libXext-devel
+Requires:	xorg-lib-libXinerama-devel
+Requires:	xorg-lib-libXft-devel
+Requires:	xorg-lib-libXmu-devel
+Requires:	xorg-lib-libXrandr-devel
+Requires:	xorg-lib-libXrender-devel
 Requires:	zlib-devel
 Conflicts:	qt2-devel
 
@@ -679,8 +689,9 @@
 perl -pi -e "
 	s|QMAKE_CC.*=.*gcc|QMAKE_CC = %{__cc}|;
 	s|QMAKE_CXX.*=.*g\+\+|QMAKE_CXX = %{__cxx}|;
-	s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|;
 	s|/usr/lib|%{_libdir}|;
+	s|/usr/X11R6/lib|/usr/%{_lib}|;
+	s|/usr/X11R6/include|/usr/include|;
 	s|\\(QTDIR\\)/lib|\\(QTDIR\\)/%{_lib}|;
 	" $plik
 
@@ -1243,6 +1254,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.353  2006/03/05 14:26:31  qboosh
+- switched to modular xorg
+
 Revision 1.352  2006/03/05 07:59:00  qboosh
 - cleanup
 
================================================================

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