SPECS (AC-branch): qt4.spec - merged 4.3.3 from HEAD

[glen]

Author: glen                         Date: Thu Dec  6 15:13:36 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged 4.3.3 from HEAD

---- Files affected:
SPECS:
   qt4.spec (1.144.2.3 -> 1.144.2.4) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.144.2.3 SPECS/qt4.spec:1.144.2.4
--- SPECS/qt4.spec:1.144.2.3	Sun Nov 11 14:53:08 2007
+++ SPECS/qt4.spec	Thu Dec  6 16:13:31 2007
@@ -40,12 +40,12 @@
 Summary(pl.UTF-8):	Biblioteka Qt do tworzenia GUI
 Summary(pt_BR.UTF-8):	Estrutura para rodar aplicações GUI Qt
 Name:		qt4
-Version:	4.3.2
-Release:	3
-License:	GPL/QPL
+Version:	4.3.3
+Release:	1
+License:	GPL v2 with OSS exception or QPL v1
 Group:		X11/Libraries
 Source0:	ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
-# Source0-md5:	a60490b36099bdd10c4d2f55430075b3
+# Source0-md5:	19678fe35170559cd6a6fa531c57799c
 Source2:	%{name}-qtconfig.desktop
 Source3:	%{name}-designer.desktop
 Source4:	%{name}-assistant.desktop
@@ -88,8 +88,7 @@
 BuildRequires:	xft-devel
 BuildRequires:	xrender-devel
 BuildRequires:	zlib-devel
-BuildConflicts:	QtCore < %{version}
-BuildConflicts:	QtCore-devel < %{version}
+BuildConflicts:	QtCore-devel < 4.3.2
 Obsoletes:	qt-extensions
 Obsoletes:	qt-utils
 Conflicts:	kdelibs <= 8:3.2-0.030602.1
@@ -1436,8 +1435,6 @@
 
 %files -n Qt3Support
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/uic3
-%attr(755,root,root) %{_qtdir}/bin/uic3
 %attr(755,root,root) %{_libdir}/libQt3Support.so.*.*
 
 %files -n QtAssistant
@@ -1534,30 +1531,45 @@
 
 %files -n QtCore-devel -f QtCore-devel.files
 %defattr(644,root,root,755)
+
 %files -n QtDBus-devel -f QtDBus-devel.files
 %defattr(644,root,root,755)
+
 %files -n QtDesigner-devel -f QtDesigner-devel.files
 %defattr(644,root,root,755)
+
 %files -n QtGui-devel -f QtGui-devel.files
 %defattr(644,root,root,755)
+
 %files -n QtNetwork-devel -f QtNetwork-devel.files
 %defattr(644,root,root,755)
+
 %files -n QtOpenGL-devel -f QtOpenGL-devel.files
 %defattr(644,root,root,755)
+
 %files -n QtScript-devel -f QtScript-devel.files
 %defattr(644,root,root,755)
+
 %files -n QtSql-devel -f QtSql-devel.files
 %defattr(644,root,root,755)
+
 %files -n QtSvg-devel -f QtSvg-devel.files
 %defattr(644,root,root,755)
+
 %files -n QtTest-devel -f QtTest-devel.files
 %defattr(644,root,root,755)
+
 %files -n QtXml-devel -f QtXml-devel.files
 %defattr(644,root,root,755)
+
 %files -n Qt3Support-devel -f Qt3Support-devel.files
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/uic3
+%attr(755,root,root) %{_qtdir}/bin/uic3
+
 %files -n QtAssistant-devel -f QtAssistant-devel.files
 %defattr(644,root,root,755)
+
 %files -n QtUiTools-devel -f QtUiTools-devel.files
 %defattr(644,root,root,755)
 
@@ -1626,6 +1638,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.144.2.4  2007-12-06 15:13:31  glen
+- merged 4.3.3 from HEAD
+
 Revision 1.144.2.3  2007-11-11 13:53:08  glen
 - ibase off; rel 3
 
================================================================

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