SPECS (AC-branch): qt.spec - HEAD merge

[glen]

Author: glen                         Date: Wed Dec  5 23:49:23 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge

---- Files affected:
SPECS:
   qt.spec (1.352.2.2.2.6 -> 1.352.2.2.2.7) 

---- Diffs:

================================================================
Index: SPECS/qt.spec
diff -u SPECS/qt.spec:1.352.2.2.2.6 SPECS/qt.spec:1.352.2.2.2.7
--- SPECS/qt.spec:1.352.2.2.2.6	Thu Dec  6 00:45:42 2007
+++ SPECS/qt.spec	Thu Dec  6 00:49:18 2007
@@ -28,9 +28,9 @@
 Summary(pt_BR.UTF-8):	Estrutura para rodar aplicações GUI Qt
 Name:		qt
 Version:	%{_ver}
-Release:	5
+Release:	8
 Epoch:		6
-License:	GPL/QPL
+License:	QPL v1 or GPL v2
 Group:		X11/Libraries
 Source0:	ftp://ftp.trolltech.com/qt/source/%{name}-x11-free-%{version}.tar.gz
 # Source0-md5:	37aec12c8c7b0e164957ec1aa3fd0189
@@ -675,7 +675,7 @@
 graficznego - Qt Designer.
 
 %prep
-%setup -q -n %{name}-x11-free-%{version} -a1
+%setup -q -n %{name}-x11-free-%{version}
 
 %patch101 -p0
 %patch102 -p0
@@ -1299,6 +1299,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.352.2.2.2.7  2007-12-05 23:49:18  glen
+- HEAD merge
+
 Revision 1.352.2.2.2.6  2007-12-05 23:45:42  glen
 - convert to utf8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qt.spec?r1=1.352.2.2.2.6&r2=1.352.2.2.2.7&f=u