SPECS: qt4.spec - fixed/updated internal deps - fixed %install, cleanups - ...

charles charles at pld-linux.org
Sun Aug 10 16:19:50 CEST 2008


Author: charles                      Date: Sun Aug 10 14:19:50 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed/updated internal deps
- fixed %install, cleanups
- rel. 2, STBR

---- Files affected:
SPECS:
   qt4.spec (1.166 -> 1.167) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.166 SPECS/qt4.spec:1.167
--- SPECS/qt4.spec:1.166	Tue Aug  5 21:25:45 2008
+++ SPECS/qt4.spec	Sun Aug 10 16:19:45 2008
@@ -39,7 +39,7 @@
 %define		_withsql	1
 %{!?with_sqlite3:%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine _withsql}}}}}}
 
-%define		rel	1
+%define		rel	2
 Summary:	The Qt GUI application framework
 Summary(es.UTF-8):	Biblioteca para ejecutar aplicaciones GUI Qt
 Summary(pl.UTF-8):	Biblioteka Qt do tworzenia GUI
@@ -166,8 +166,6 @@
 Summary(pl.UTF-8):	Podstawowe klasy używane przez inne moduły - pliki programistyczne
 Group:		X11/Development/Libraries
 Requires:	QtCore = %{version}-%{release}
-Requires:	QtXml-devel = %{version}-%{release}
-Requires:	QtXmlPatterns-devel = %{version}-%{release}
 Requires:	glib2-devel
 Requires:	libstdc++-devel
 Requires:	zlib-devel
@@ -296,6 +294,7 @@
 Group:		X11/Development/Libraries
 Requires:	OpenGL-GLU-devel
 Requires:	QtCore-devel = %{version}-%{release}
+Requires:	QtGui-devel = %{version}-%{release}
 Requires:	QtOpenGL = %{version}-%{release}
 
 %description -n QtOpenGL-devel
@@ -313,7 +312,7 @@
 %description -n QtOpenGL-static
 OpenGL support classes - static libraries.
 
-%description -n QtOpenGL-devel -l pl.UTF-8
+%description -n QtOpenGL-static -l pl.UTF-8
 Klasy wspomagające OpenGL - biblioteki statyczne.
 
 %package -n QtSql
@@ -485,8 +484,8 @@
 Summary:	SVG support - development files
 Summary(pl.UTF-8):	Wsparcie dla SVG - pliki programistyczne
 Group:		X11/Development/Libraries
+Requires:	QtGui-devel = %{version}-%{release}
 Requires:	QtSvg = %{version}-%{release}
-Requires:	QtXml-devel = %{version}-%{release}
 
 %description -n QtSvg-devel
 SVG support - development files.
@@ -644,6 +643,7 @@
 Summary(pl.UTF-8):	Biblioteka kliencka Qt Assistant - pliki programistyczne
 Group:		X11/Development/Libraries
 Requires:	QtAssistant = %{version}-%{release}
+Requires:	QtGui-devel = %{version}-%{release}
 Requires:	QtNetwork-devel = %{version}-%{release}
 
 %description -n QtAssistant-devel
@@ -736,6 +736,8 @@
 Group:		X11/Development/Libraries
 Requires:	QtDesigner = %{version}-%{release}
 Requires:	QtGui-devel = %{version}-%{release}
+Requires:	QtScript-devel = %{version}-%{release}
+Requires:	QtXml-devel = %{version}-%{release}
 
 %description -n QtDesigner-devel
 Classes for extending Qt Designer - development files.
@@ -772,6 +774,7 @@
 Summary:	Classes for scripting applications - development files
 Summary(pl.UTF-8):	Klasy do obsługi skryptów wewnątrz aplikacji - pliki programistyczne
 Group:		X11/Development/Libraries
+Requires:	QtCore-devel = %{version}-%{release}
 Requires:	QtScript = %{version}-%{release}
 
 %description -n QtScript-devel
@@ -812,8 +815,9 @@
 Summary:	Classes for handling Qt Designer forms in applications - development files
 Summary(pl.UTF-8):	Klasy do obsługi formularzy Qt Designera w aplikacjach - pliki programistyczne
 Group:		X11/Development/Libraries
-Requires:	QtCore-devel = %{version}-%{release}
+Requires:	QtGui-devel = %{version}-%{release}
 Requires:	QtUiTools = %{version}-%{release}
+Requires:	QtXml-devel = %{version}-%{release}
 
 %description -n QtUiTools-devel
 Classes for handling Qt Designer forms in applications - development
@@ -848,7 +852,11 @@
 %package -n QtHelp-devel
 Summary:	QtHelp - development files
 Group:		X11/Development/Libraries
-Requires:	QtCore-devel = %{version}-%{release}
+Requires:	QtCLucene-devel = %{version}-%{release}
+Requires:	QtHelp = %{version}-%{release}
+Requires:	QtGui-devel = %{version}-%{release}
+Requires:	QtSql-devel = %{version}-%{release}
+Requires:	QtXml-devel = %{version}-%{release}
 
 %description -n QtHelp-devel
 QtHelp - development files.
@@ -856,7 +864,7 @@
 %package -n QtHelp-static
 Summary:	QtHelp - static libraries
 Group:		X11/Development/Libraries
-Requires:	QtCore-devel = %{version}-%{release}
+Requires:	QtHelp-devel = %{version}-%{release}
 
 %description -n QtHelp-static
 QtHelp - static libraries.
@@ -872,7 +880,9 @@
 %package -n QtWebKit-devel
 Summary:	QtWebKit - development files
 Group:		X11/Development/Libraries
-Requires:	QtCore-devel = %{version}-%{release}
+Requires:	QtGui-devel = %{version}-%{release}
+Requires:	QtNetwork-devel = %{version}-%{release}
+Requires:	QtWebKit = %{version}-%{release}
 
 %description -n QtWebKit-devel
 QtWebKit - development files.
@@ -880,7 +890,7 @@
 %package -n QtWebKit-static
 Summary:	QtWebKit - static libraries
 Group:		X11/Development/Libraries
-Requires:	QtCore-devel = %{version}-%{release}
+Requires:	QtWebKit-devel = %{version}-%{release}
 
 %description -n QtWebKit-static
 QtWebKit - static libraries.
@@ -888,7 +898,7 @@
 %package -n QtCLucene
 Summary:	QtCLucene
 Group:		X11/Libraries
-Requires:	QtGui = %{version}-%{release}
+Requires:	QtCore = %{version}-%{release}
 
 %description -n QtCLucene
 QtCLucene.
@@ -905,7 +915,7 @@
 %package -n QtCLucene-static
 Summary:	QtCLucene - static libraries
 Group:		X11/Development/Libraries
-Requires:	QtCore-devel = %{version}-%{release}
+Requires:	QtCLucene-devel = %{version}-%{release}
 
 %description -n QtCLucene-static
 QtCLucene - static libraries.
@@ -913,7 +923,7 @@
 %package -n QtXmlPatterns
 Summary:	QtXmlPatterns
 Group:		X11/Libraries
-Requires:	QtGui = %{version}-%{release}
+Requires:	QtCore = %{version}-%{release}
 
 %description -n QtXmlPatterns
 QtXmlPatterns.
@@ -921,7 +931,7 @@
 %package -n QtXmlPatterns-devel
 Summary:	QtXmlPatterns - development files
 Group:		X11/Development/Libraries
-Requires:	QtCore-devel = %{version}-%{release}
+Requires:	QtNetwork-devel = %{version}-%{release}
 Requires:	QtXmlPatterns = %{version}-%{release}
 
 %description -n QtXmlPatterns-devel
@@ -930,7 +940,7 @@
 %package -n QtXmlPatterns-static
 Summary:	QtXmlPatterns - static libraries
 Group:		X11/Development/Libraries
-Requires:	QtCore-devel = %{version}-%{release}
+Requires:	QtXmlPatterns-devel = %{version}-%{release}
 
 %description -n QtXmlPatterns-static
 QtXmlPatterns - static libraries.
@@ -1015,6 +1025,8 @@
 Summary:	phonon - development files
 Group:		X11/Development/Libraries
 Requires:	QtCore-devel = %{version}-%{release}
+Requires:	QtDBus-devel = %{version}-%{release}
+Requires:	QtGui-devel = %{version}-%{release}
 Requires:	qt4-phonon = %{version}-%{release}
 
 %description phonon-devel
@@ -1323,7 +1335,8 @@
 done
 
 cd $RPM_BUILD_ROOT%{_includedir}/qt4/Qt
-for f in ../Qt{3Support,Assistant,Core,DBus,Designer,Gui,Network,OpenGL,Script,Sql,Svg,Test,UiTools,Xml}/*; do
+# QtCore must be the last
+for f in ../Qt{3Support,Assistant,DBus,Designer,Gui,Help,Network,OpenGL,Script,Sql,Svg,Test,UiTools,WebKit,Xml,XmlPatterns,Core}/*; do
 	if [ ! -d $f ]; then
 		ln -sf $f `basename $f`
 	fi
@@ -1411,6 +1424,9 @@
 mkdevfl QtDesigner || /bin/true
 mkdevfl QtUiTools || /bin/true
 
+# without glob (exclude QtXmlPatterns*)
+%{__sed} -i 's,QtXml\*,QtXml,g' QtXml-devel.files
+
 echo "%defattr(644,root,root,755)" > examples.files
 ifecho examples %{_examplesdir}/qt4
 for f in `find $RPM_BUILD_ROOT%{_examplesdir}/qt4 -printf "%%P "`; do
@@ -1900,6 +1916,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.167  2008/08/10 14:19:45  charles
+- fixed/updated internal deps
+- fixed %install, cleanups
+- rel. 2, STBR
+
 Revision 1.166  2008/08/05 19:25:45  shadzik
 - 4.4.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qt4.spec?r1=1.166&r2=1.167&f=u



More information about the pld-cvs-commit mailing list