SPECS (qt-copy): qt.spec - initial fixes for modular xorg.

[pluto]

Author: pluto                        Date: Fri Feb  3 20:04:18 2006 GMT
Module: SPECS                         Tag: qt-copy
---- Log message:
- initial fixes for modular xorg.

---- Files affected:
SPECS:
   qt.spec (1.341.2.6 -> 1.341.2.7) 

---- Diffs:

================================================================
Index: SPECS/qt.spec
diff -u SPECS/qt.spec:1.341.2.6 SPECS/qt.spec:1.341.2.7
--- SPECS/qt.spec:1.341.2.6	Tue Jan 24 16:56:52 2006
+++ SPECS/qt.spec	Fri Feb  3 21:04:13 2006
@@ -62,6 +62,7 @@
 URL:		http://www.trolltech.com/products/qt/
 %{?with_ibase:BuildRequires:	Firebird-devel}
 BuildRequires:	OpenGL-devel
+BuildRequires:	OpenGLU-devel
 %{?with_nvidia:BuildRequires:	X11-driver-nvidia-devel >= 1.0.6111-2}
 %{?with_cups:BuildRequires:	cups-devel}
 BuildRequires:	flex
@@ -83,17 +84,13 @@
 # There is an internal sqlite copy used to
 # build this plugin - TODO
 #%{?with_sqlite:BuildRequires:	sqlite-devel}
-BuildRequires:	xcursor-devel
-BuildRequires:	xft-devel
-BuildRequires:	xrender-devel
+BuildRequires:	xorg-lib-libXcursor-devel
+BuildRequires:	xorg-lib-libXft-devel
+BuildRequires:	xorg-lib-libXrandr-devel
+BuildRequires:	xorg-lib-libXrender-devel
 BuildRequires:	zlib-devel
-#Requires:	xft
-#Requires:	xcursor
-#Requires:	xrender
 Requires:	freetype >= 2.0.0
-#Requires:	libjpeg
 Requires:	libmng >= 1.0.0
-#Requires:	libpng
 Requires:	OpenGL
 Obsoletes:	qt-extensions
 Obsoletes:	qt-utils
@@ -102,6 +99,8 @@
 
 %define		_noautoreqdep	libGL.so.1 libGLU.so.1
 
+%define		specflags	-fno-strict-aliasing
+
 # <begin main library description>
 
 %description
@@ -174,14 +173,16 @@
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	OpenGL-devel
+Requires:	OpenGLU-devel
 Requires:	freetype-devel >= 2.0.0
 Requires:	libjpeg-devel
 Requires:	libmng-devel >= 1.0.0
 Requires:	libpng-devel
 Requires:	libstdc++-devel
-Requires:	xcursor-devel
-Requires:	xft-devel
-Requires:	xrender-devel
+Requires:	xorg-lib-libXcursor-devel
+Requires:	xorg-lib-libXft-devel
+Requires:	xorg-lib-libXrandr-devel
+Requires:	xorg-lib-libXrender-devel
 Requires:	zlib-devel
 Conflicts:	qt2-devel
 
@@ -685,8 +686,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/include|%{_includedir}|;
+	s|/usr/X11R6/lib|%{_libdir}|;
 	s|\\(QTDIR\\)/lib|\\(QTDIR\\)/%{_lib}|;
 	" $plik
 
@@ -710,7 +712,7 @@
 export LD_LIBRARY_PATH=$QTDIR/%{_lib}:$LD_LIBRARY_PATH
 
 if [ "%{_lib}" != "lib" ] ; then
-	ln -s lib "%{_lib}"
+	rm -rf %{_lib} && ln -sf lib %{_lib}
 fi
 
 # pass OPTFLAGS to build qmake itself with optimization
@@ -1250,6 +1252,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.341.2.7  2006/02/03 20:04:13  pluto
+- initial fixes for modular xorg.
+
 Revision 1.341.2.6  2006/01/24 15:56:52  adgor
 - Icon killed
 
================================================================

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