packages: qt4/qt4.spec - revised strict internal deps

qboosh qboosh at pld-linux.org
Sun Sep 26 11:31:06 CEST 2010 

Author: qboosh                       Date: Sun Sep 26 09:31:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- revised strict internal deps

---- Files affected:
packages/qt4:
   qt4.spec (1.261 -> 1.262) 

---- Diffs:

================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.261 packages/qt4/qt4.spec:1.262
--- packages/qt4/qt4.spec:1.261	Sun Sep 26 10:07:32 2010
+++ packages/qt4/qt4.spec	Sun Sep 26 11:31:00 2010
@@ -215,7 +215,6 @@
 Requires:	QtGui-devel = %{version}-%{release}
 Requires:	QtNetwork-devel = %{version}-%{release}
 Requires:	QtSql-devel = %{version}-%{release}
-Requires:	QtXml-devel = %{version}-%{release}
 
 %description -n Qt3Support-devel
 Qt3 compatibility library - development files.
@@ -319,6 +318,9 @@
 Summary:	Qt classes for D-BUS support
 Summary(pl.UTF-8):	Klasy Qt do obsługi D-BUS
 Group:		X11/Libraries
+Requires:	QtCore = %{version}-%{release}
+Requires:	QtGui = %{version}-%{release}
+Requires:	QtScript = %{version}-%{release}
 Requires:	QtXml = %{version}-%{release}
 
 %description -n QtDBus
@@ -340,8 +342,6 @@
 Group:		X11/Development/Libraries
 Requires:	QtDBus = %{version}-%{release}
 Requires:	QtXml-devel = %{version}-%{release}
-Requires:	dbus-devel
-Requires:	glib2-devel >= 2.0.0
 
 %description -n QtDBus-devel
 Qt classes for D-BUS support - development files.
@@ -365,7 +365,16 @@
 Summary:	QtDeclarative - QML language engine library
 Summary(pl.UTF-8):	QtDeclarative - biblioteka języka QML
 Group:		X11/Libraries
+Requires:	QtCore = %{version}-%{release}
 Requires:	QtGui = %{version}-%{release}
+Requires:	QtNetwork = %{version}-%{release}
+Requires:	QtOpenGL = %{version}-%{release}
+Requires:	QtScript = %{version}-%{release}
+Requires:	QtSql = %{version}-%{release}
+Requires:	QtSvg = %{version}-%{release}
+Requires:	QtXmlPatterns = %{version}-%{release}
+# for qmlwebkitplugin plugin
+Requires:	QtWebKit = %{version}-%{release}
 
 %description -n QtDeclarative
 QtDeclarative is the QML language engine library. QML is a declarative
@@ -380,6 +389,8 @@
 Summary(pl.UTF-8):	Pliki programistyczne QtDeclarative - biblioteki języka QML
 Group:		X11/Development/Libraries
 Requires:	QtGui-devel = %{version}-%{release}
+Requires:	QtNetwork-devel = %{version}-%{release}
+Requires:	QtScript-devel = %{version}-%{release}
 
 %description -n QtDeclarative-devel
 Development files for QtDeclarative - QML language engine library.
@@ -403,11 +414,19 @@
 Summary:	Classes for extending Qt Designer
 Summary(pl.UTF-8):	Klasy do rozbudowy Qt Designera
 Group:		X11/Libraries
-Requires:	QtDeclarative = %{version}-%{release}
 Requires:	QtGui = %{version}-%{release}
 Requires:	QtNetwork = %{version}-%{release}
 Requires:	QtScript = %{version}-%{release}
 Requires:	QtXml = %{version}-%{release}
+# for plugins
+Requires:	Qt3Support = %{version}-%{release}
+Requires:	QtDBus = %{version}-%{release}
+Requires:	QtDeclarative = %{version}-%{release}
+Requires:	QtOpenGL = %{version}-%{release}
+Requires:	QtSql = %{version}-%{release}
+Requires:	QtSvg = %{version}-%{release}
+Requires:	QtWebKit = %{version}-%{release}
+Requires:	QtXmlPatterns = %{version}-%{release}
 Obsoletes:	qt4-designer-libs
 
 %description -n QtDesigner
@@ -451,9 +470,19 @@
 Summary(pl.UTF-8):	Komponenty graficznego interfejsu użytkownika Qt
 Group:		X11/Libraries
 Requires:	QtCore = %{version}-%{release}
-# two following because of some plugins
+# for plugins:
+# qtaccessiblecompatwidgets
 Requires:	Qt3Support = %{version}-%{release}
+# qtaccessiblecompatwidgets, qtracegraphicssystem
+Requires:	QtNetwork = %{version}-%{release}
+# qglgraphicssystem
+Requires:	QtOpenGL = %{version}-%{release}
+# qtaccessiblecompatwidgets
 Requires:	QtSql = %{version}-%{release}
+# qsvgicon, qsvg
+Requires:	QtSvl = %{version}-%{release}
+# qtaccessiblecompatwidgets, qsvgicon, qsvg
+Requires:	QtXml = %{version}-%{release}
 
 %description -n QtGui
 Qt Graphical User Interface components.
@@ -503,7 +532,11 @@
 Summary:	Qt classes for integrating online documentation in applications
 Summary(pl.UTF-8):	Klasy Qt do integracji dokumentacji w aplikacjach
 Group:		X11/Libraries
+Requires:	QtCLucene = %{version}-%{release}
 Requires:	QtGui = %{version}-%{release}
+Requires:	QtNetwork = %{version}-%{release}
+Requires:	QtSql = %{version}-%{release}
+Requires:	QtXml = %{version}-%{release}
 
 %description -n QtHelp
 QtHelp module includes tools for generating and viewing Qt help files.
@@ -554,6 +587,7 @@
 Summary(pl.UTF-8):	Klasy Qt do programowania multimediów
 Group:		X11/Libraries
 Requires:	QtCore = %{version}-%{release}
+Requires:	QtGui = %{version}-%{release}
 
 %description -n QtMultimedia
 Qt classes for multimedia programming.
@@ -566,6 +600,7 @@
 Summary(pl.UTF-8):	Klasy Qt do programowania multimediów - pliki programistyczne
 Group:		X11/Development/Libraries
 Requires:	QtCore-devel = %{version}-%{release}
+Requires:	QtMultimedia = %{version}-%{release}
 
 %description -n QtMultimedia-devel
 Qt classes for multimedia programming - development files.
@@ -577,7 +612,7 @@
 Summary:	Qt classes for multimedia programming - static libraries
 Summary(pl.UTF-8):	Klasy Qt do programowania multimediów - biblioteki statyczne
 Group:		X11/Development/Libraries
-Requires:	QtNetwork-devel = %{version}-%{release}
+Requires:	QtMultimedia-devel = %{version}-%{release}
 
 %description -n QtMultimedia-static
 Qt classes for multimedia programming - static libraries.
@@ -590,6 +625,9 @@
 Summary(pl.UTF-8):	Klasy Qt do programowania sieciowego
 Group:		X11/Libraries
 Requires:	QtCore = %{version}-%{release}
+# the rest for qnmbearer plugin
+Requires:	QtDBus = %{version}-%{release}
+Requires:	QtXml = %{version}-%{release}
 
 %description -n QtNetwork
 Qt classes for network programming.
@@ -627,6 +665,7 @@
 Summary(pl.UTF-8):	Klasy Qt wspomagające OpenGL
 Group:		X11/Libraries
 Requires:	QtCore = %{version}-%{release}
+Requires:	QtGui = %{version}-%{release}
 
 %description -n QtOpenGL
 Qt OpenGL support classes.
@@ -665,6 +704,7 @@
 Summary:	Qt classes for scripting applications
 Summary(pl.UTF-8):	Klasy Qt pozwalające dodać obsługę skryptów w aplikacjach
 Group:		X11/Development/Libraries
+Requires:	QtCore = %{version}-%{release}
 
 %description -n QtScript
 The QtScript module provides Qt classes to handle scripts inside
@@ -704,6 +744,9 @@
 Summary:	Qt classes for scripting applications
 Summary(pl.UTF-8):	Klasy Qt pozwalające dodać obsługę skryptów w aplikacjach
 Group:		X11/Development/Libraries
+Requires:	QtCore = %{version}-%{release}
+Requires:	QtGui = %{version}-%{release}
+Requires:	QtScript = %{version}-%{release}
 
 %description -n QtScriptTools
 The QtScriptTools module provides Qt classes to handle scripts inside
@@ -718,6 +761,7 @@
 Summary(pl.UTF-8):	Klasy Qt do obsługi skryptów wewnątrz aplikacji - pliki programistyczne
 Group:		X11/Development/Libraries
 Requires:	QtCore-devel = %{version}-%{release}
+Requires:	QtGui-devel = %{version}-%{release}
 Requires:	QtScript-devel = %{version}-%{release}
 Requires:	QtScriptTools = %{version}-%{release}
 
@@ -917,7 +961,8 @@
 Summary:	Qt SVG support
 Summary(pl.UTF-8):	Wsparcie Qt dla SVG
 Group:		X11/Libraries
-Requires:	QtXml = %{version}-%{release}
+Requires:	QtCore = %{version}-%{release}
+Requires:	QtGui = %{version}-%{release}
 
 %description -n QtSvg
 Qt SVG support.
@@ -1036,7 +1081,10 @@
 Summary:	Qt classes for rendering HTML, XHTML and SVG documents
 Summary(pl.UTF-8):	Klasy Qt do renderowania dokumentów HTML, XHTML i SVG
 Group:		X11/Libraries
+Requires:	QtDBus = %{version}-%{release}
 Requires:	QtGui = %{version}-%{release}
+Requires:	QtNetwork = %{version}-%{release}
+Requires:	QtXml = %{version}-%{release}
 
 %description -n QtWebKit
 QtWebKit provides a Web browser engine that makes it easy to embed
@@ -1063,7 +1111,6 @@
 Requires:	QtGui-devel = %{version}-%{release}
 Requires:	QtNetwork-devel = %{version}-%{release}
 Requires:	QtScript-devel = %{version}-%{release}
-Requires:	QtXmlPatterns-devel = %{version}-%{release}
 Requires:	QtWebKit = %{version}-%{release}
 %if %{with system_phonon}
 Requires:	phonon-devel
@@ -1134,6 +1181,7 @@
 Summary(pl.UTF-8):	Silnik zapytań XQuery QtXmlPatterns
 Group:		X11/Libraries
 Requires:	QtCore = %{version}-%{release}
+Requires:	QtNetwork = %{version}-%{release}
 
 %description -n QtXmlPatterns
 QtXmlPatterns XQuery engine.
@@ -1170,8 +1218,13 @@
 Summary:	Qt documentation browser
 Summary(pl.UTF-8):	Przeglądarka dokumentacji Qt
 Group:		X11/Development/Tools
-Requires:	QtDBus = %{version}-%{release}
+Requires:	QtGui = %{version}-%{release}
+Requires:	QtHelp = %{version}-%{release}
+Requires:	QtNetwork = %{version}-%{release}
+Requires:	QtSql = %{version}-%{release}
 Requires:	QtSql-sqlite3 = %{version}-%{release}
+Requires:	QtWebKit = %{version}-%{release}
+Requires:	QtXml = %{version}-%{release}
 
 %description assistant
 Qt Assistant is a tool for browsing on-line documentation with
@@ -1186,6 +1239,7 @@
 Summary(pl.UTF-8):	Narzędzia do budowania dla Qt4
 Group:		X11/Development/Tools
 Requires:	QtCore = %{version}-%{release}
+Requires:	QtGui = %{version}-%{release}
 Requires:	QtXml = %{version}-%{release}
 
 %description build
@@ -1280,6 +1334,7 @@
 Summary(pl.UTF-8):	Narzędzie do konfigurowania widgetów Qt
 Group:		X11/Applications
 Requires:	Qt3Support = %{version}-%{release}
+Requires:	QtDBus = %{version}-%{release}
 Requires:	QtGui = %{version}-%{release}
 Requires:	QtNetwork = %{version}-%{release}
 Requires:	QtSql = %{version}-%{release}
@@ -1310,7 +1365,16 @@
 Summary:	Demos of new Qt4 features
 Summary(pl.UTF-8):	Programy demonstrujące nowe możliwości Qt4
 Group:		X11/Development/Libraries
+Requires:	QtDeclarative = %{version}-%{release}
+Requires:	QtGui = %{version}-%{release}
+Requires:	QtHelp = %{version}-%{release}
+Requires:	QtNetwork = %{version}-%{release}
+Requires:	QtOpenGL = %{version}-%{release}
+Requires:	QtScript = %{version}-%{release}
+Requires:	QtSql = %{version}-%{release}
+Requires:	QtSvg = %{version}-%{release}
 Requires:	QtXml = %{version}-%{release}
+Requires:	QtXmlPatterns = %{version}-%{release}
 
 %description demos
 Demos are spiders that fly.
@@ -2271,6 +2335,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.262  2010/09/26 09:31:00  qboosh
+- revised strict internal deps
+
 Revision 1.261  2010/09/26 08:07:32  qboosh
 - descs cleanup/slightly improved
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4.spec?r1=1.261&r2=1.262&f=u

More information about the pld-cvs-commit mailing list