SPECS: qt4.spec - BR: gtk+2-devel (with bcond) - QtWebKit-devel - R: qt4-ph...

[charles]

Author: charles                      Date: Sat Mar  7 08:02:23 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR: gtk+2-devel (with bcond)
- QtWebKit-devel - R: qt4-phonon-devel
- fixed QtScript-devel %files

---- Files affected:
SPECS:
   qt4.spec (1.187 -> 1.188) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.187 SPECS/qt4.spec:1.188
--- SPECS/qt4.spec:1.187	Thu Mar  5 14:40:01 2009
+++ SPECS/qt4.spec	Sat Mar  7 09:02:17 2009
@@ -41,6 +41,7 @@
 %bcond_without	sqlite		# don't build SQLite2 plugin
 %bcond_without	ibase		# don't build ibase (InterBase/Firebird) plugin
 %bcond_without	pch		# disable pch in qmake
+%bcond_without	gtk		# don't build GTK theme integration
 %bcond_with	sse		# use SSE instructions in gui/painting module
 %bcond_with	sse2		# use SSE2 instructions
 #
@@ -98,6 +99,7 @@
 BuildRequires:	giflib-devel
 BuildRequires:	glib2-devel >= 2.0.0
 BuildRequires:	gstreamer-plugins-base-devel
+%{?with_gtk:BuildRequires:	gtk+2-devel}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libmng-devel >= 1.0.0
 BuildRequires:	libpng-devel >= 2:1.0.8
@@ -999,6 +1001,7 @@
 Requires:	QtGui-devel = %{version}-%{release}
 Requires:	QtNetwork-devel = %{version}-%{release}
 Requires:	QtWebKit = %{version}-%{release}
+Requires:	qt4-phonon-devel = %{version}-%{release}
 
 %description -n QtWebKit-devel
 Classes for rendering HTML, XHTML and SVG documents - development
@@ -1593,7 +1596,8 @@
 mkdevfl QtDesigner || /bin/true
 mkdevfl QtUiTools || /bin/true
 
-# without glob (exclude QtXmlPatterns*)
+# without glob (exclude QtScriptTools* QtXmlPatterns*)
+%{__sed} -i 's,QtScript\*,QtScript,g' QtScript-devel.files
 %{__sed} -i 's,QtXml\*,QtXml,g' QtXml-devel.files
 
 echo "%defattr(644,root,root,755)" > examples.files
@@ -2111,6 +2115,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.188  2009/03/07 08:02:17  charles
+- BR: gtk+2-devel (with bcond)
+- QtWebKit-devel - R: qt4-phonon-devel
+- fixed QtScript-devel %files
+
 Revision 1.187  2009/03/05 13:40:01  djurban
 - install qdoc3 (required by qt-creator)
 - rel. 3
================================================================

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