rpms/qt4/devel qt4.spec,1.26,1.27

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30582

Modified Files:
	qt4.spec 
Log Message:
* Wed Nov 15 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.1-3
- move libQtDesigner to -x11



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- qt4.spec	28 Oct 2006 18:51:14 -0000	1.26
+++ qt4.spec	15 Nov 2006 16:41:16 -0000	1.27
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -134,7 +134,7 @@
 Summary: Development files for the Qt toolkit
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: %{name}-x11 = %{version}-%{release}
+Requires: %{name}-x11 
 Requires: %{x_deps}
 Requires: libpng-devel
 Requires: libjpeg-devel
@@ -402,12 +402,12 @@
 %files x11 
 %defattr(-,root,root,-)
 %{qt_libdir}/libQt3Support.so.*
+%{qt_libdir}/libQtAssistantClient.so.*
+%{qt_libdir}/libQtDesigner.so.*
+%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQtGui.so.*
 %{qt_libdir}/libQtOpenGL.so.*
 %{qt_libdir}/libQtSvg.so.*
-%if "%{version}" >= "4.2.0"
-%{qt_libdir}/libQtAssistantClient.so.*
-%endif
 %{qtdir}/plugins/*
 %exclude %{qtdir}/plugins/designer
 %exclude %{qtdir}/plugins/sqldrivers
@@ -449,8 +449,6 @@
 %{qt_datadir}/mkspecs/
 %{qt_datadir}/phrasebooks/
 %{qt_datadir}/q3porting.xml
-%{qt_libdir}/libQtDesigner.so.*
-%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQt*.so
 # remaining static lib: libQtUiTools.a 
 %{qt_libdir}/libQt*.a
@@ -509,14 +507,17 @@
 
 
 %changelog
-* Mon Oct 23 2006 Rex Dieter 4.2.1-2
+* Wed Nov 15 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.1-3
+- move libQtDesigner to -x11
+
+* Mon Oct 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.1-2
 - use respun upstream 4.2.1 tarball
 - fix pre-modular-X libGL/libGLU deps (#211898)
 
 * Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.1-1
 - 4.2.1
 
-* Wed Oct 04 2006 Rex Dieter 4.2.0-1
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-1
 - 4.2.0(final)
 
 * Thu Sep 28 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.0-0.9.20060927