packages: qt4/qt4.spec - moved plugin dirs to proper packages (based on whi...

qboosh qboosh at pld-linux.org
Sun Sep 26 14:05:27 CEST 2010


Author: qboosh                       Date: Sun Sep 26 12:05:27 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- moved plugin dirs to proper packages (based on which package loads particular kind of plugins)
- moved codecs plugins from QtGui to QtCore (they are used by QtCore and depend only on QtCore)

---- Files affected:
packages/qt4:
   qt4.spec (1.264 -> 1.265) 

---- Diffs:

================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.264 packages/qt4/qt4.spec:1.265
--- packages/qt4/qt4.spec:1.264	Sun Sep 26 13:50:22 2010
+++ packages/qt4/qt4.spec	Sun Sep 26 14:05:22 2010
@@ -295,9 +295,10 @@
 Summary(pl.UTF-8):	Klasy Qt do obsługi D-BUS
 Group:		X11/Libraries
 Requires:	QtCore = %{version}-%{release}
+Requires:	QtXml = %{version}-%{release}
+# only for libqtscriptdbus plugin
 Requires:	QtGui = %{version}-%{release}
 Requires:	QtScript = %{version}-%{release}
-Requires:	QtXml = %{version}-%{release}
 
 %description -n QtDBus
 This module provides Qt classes for D-BUS support. D-BUS is an
@@ -1826,16 +1827,11 @@
 %dir %{_qtdir}
 %dir %{_qtdir}/bin
 %dir %{_qtdir}/plugins
-%dir %{_qtdir}/plugins/bearer
 %dir %{_qtdir}/plugins/codecs
+%attr(755,root,root) %{_qtdir}/plugins/codecs/*.so
+# two following are used only by foreign packages, not QtCore
 %dir %{_qtdir}/plugins/crypto
-%dir %{_qtdir}/plugins/graphicssystems
-%dir %{_qtdir}/plugins/iconengines
-%dir %{_qtdir}/plugins/imageformats
-%dir %{_qtdir}/plugins/inputmethods
 %dir %{_qtdir}/plugins/network
-%dir %{_qtdir}/plugins/sqldrivers
-%dir %{_qtdir}/plugins/script
 %dir %{_datadir}/qt4
 %lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/qt4.qm
 %lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/qt4.qm
@@ -1898,14 +1894,18 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQtGui.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQtGui.so.4
+%dir %{_qtdir}/plugins/accessible
 %attr(755,root,root) %{_qtdir}/plugins/accessible/libqtaccessiblewidgets.so
-%attr(755,root,root) %{_qtdir}/plugins/codecs/*.so
+%dir %{_qtdir}/plugins/graphicssystems
 %attr(755,root,root) %{_qtdir}/plugins/graphicssystems/libqtracegraphicssystem.so
+%dir %{_qtdir}/plugins/iconengines
+%dir %{_qtdir}/plugins/imageformats
 %attr(755,root,root) %{_qtdir}/plugins/imageformats/libqgif.so
 %attr(755,root,root) %{_qtdir}/plugins/imageformats/libqico.so
 %attr(755,root,root) %{_qtdir}/plugins/imageformats/libqjpeg.so
 %attr(755,root,root) %{_qtdir}/plugins/imageformats/libqmng.so
 %attr(755,root,root) %{_qtdir}/plugins/imageformats/libqtiff.so
+%dir %{_qtdir}/plugins/inputmethods
 %attr(755,root,root) %{_qtdir}/plugins/inputmethods/*.so
 
 %files -n QtHelp
@@ -1936,6 +1936,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQtNetwork.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQtNetwork.so.4
+%dir %{_qtdir}/plugins/bearer
 %attr(755,root,root) %{_qtdir}/plugins/bearer/*.so
 
 %files -n QtOpenGL
@@ -1948,6 +1949,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQtScript.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQtScript.so.4
+%dir %{_qtdir}/plugins/script
 
 %files -n QtScriptTools
 %defattr(644,root,root,755)
@@ -1958,6 +1960,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQtSql.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQtSql.so.4
+%dir %{_qtdir}/plugins/sqldrivers
 
 %if %{with mysql}
 %files -n QtSql-mysql
@@ -2317,6 +2320,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.265  2010/09/26 12:05:22  qboosh
+- moved plugin dirs to proper packages (based on which package loads particular kind of plugins)
+- moved codecs plugins from QtGui to QtCore (they are used by QtCore and depend only on QtCore)
+
 Revision 1.264  2010/09/26 11:50:22  qboosh
 - locale packaging fixes
 - cleanup libphonon.a
================================================================

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



More information about the pld-cvs-commit mailing list