rpms/qt4/FC-4 qt4.spec,1.16,1.17

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6977

Modified Files:
	qt4.spec 
Log Message:
* Wed Nov 15 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.5-3
- move libQtDesigner to -x11
- fix pre-modular-X libGL/libGLU deps (#211898)



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- qt4.spec	23 Oct 2006 23:06:49 -0000	1.16
+++ qt4.spec	16 Nov 2006 21:14:57 -0000	1.17
@@ -5,7 +5,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -67,9 +67,12 @@
 BuildRequires: freetype-devel
 BuildRequires: zlib-devel
 
-%define x_deps libGL-devel libGLU-devel
-%if "%{?fedora}" > "4"
-%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
+## In theory, should be as simple as:
+#define x_deps libGL-devel libGLU-devel
+## but, "xorg-x11-devel: missing dep on libGL/libGLU" - http://bugzilla.redhat.com/211898
+%define x_deps xorg-x11-devel xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
 %endif
 BuildRequires: %{x_deps}
 
@@ -353,6 +356,8 @@
 %dir %{qtdir}/bin/
 %dir %{qt_datadir}
 %{qt_libdir}/libQtCore.so.*
+%{qt_libdir}/libQtDesigner.so.*
+%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQtNetwork.so.*
 %{qt_libdir}/libQtSql.so.*
 %{qt_libdir}/libQtTest.so.*
@@ -402,8 +407,6 @@
 %{qt_datadir}/mkspecs/
 %{qt_datadir}/phrasebooks/
 %{qt_datadir}/q3porting.xml
-%{qt_libdir}/libQtDesigner.so.*
-%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQt*.so
 # 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a 
 %{qt_libdir}/libQt*.a
@@ -462,6 +465,10 @@
 
 
 %changelog
+* Wed Nov 15 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.5-3
+- move libQtDesigner to -x11
+- fix pre-modular-X libGL/libGLU deps (#211898)
+
 * Mon Oct 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.5-2
 - fix qm2ts conflict with qt-devel