rpms/qt4/EL-4 .cvsignore,1.15,1.16 qt4.spec,1.37,1.38

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/qt4/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10156/EL-4

Modified Files:
	.cvsignore qt4.spec 
Log Message:
* Tue Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-8
- License: GPL, dropping QPL (#237702)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/EL-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	23 Mar 2007 15:07:51 -0000	1.15
+++ .cvsignore	25 Apr 2007 15:16:07 -0000	1.16
@@ -1,3 +1,2 @@
 clog
-OLD/
 qt-x11-opensource-src-4.2.3.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/EL-4/qt4.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- qt4.spec	26 Mar 2007 17:48:34 -0000	1.37
+++ qt4.spec	25 Apr 2007 15:16:07 -0000	1.38
@@ -13,9 +13,9 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.3
-Release: 6%{?dist}.3
+Release: 8%{?dist}
 
-License: GPL/QPL
+License: GPL
 Group: 	 System Environment/Libraries
 Url:   	 http://www.trolltech.com/products/qt/
 %if "%{?snap:1}" == "1"
@@ -35,6 +35,8 @@
 Patch1: qt-x11-opensource-src-4.1.2-assistant4.patch
 # multilib hacks 
 Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
+# CVE-2007-0242
+Patch3: utf8-bug-qt4-2.diff
 ## qt-copy patches
 Patch0154: 0154-qdbuscpp2xml-moc_path.diff
 
@@ -124,15 +126,11 @@
 %endif
 
 %if "%{?sqlite:1}" != "-no-sql-sqlite"
+%if 0%{?fedora} > 2 
 %define _system_sqlite -system-sqlite
-%if "%{?rhel}" == "4"
-%ifarch ppc
-# el4/ppc doesn't have sqlite-devel, wtf? -- Rex
-%undefine _system_sqlite
+BuildRequires: sqlite-devel
 %endif
 %endif
-%endif
-%{?_system_sqlite:BuildRequires: sqlite-devel}
 
 Obsoletes: %{name}-config < %{version}-%{release}
 Provides:  %{name}-config = %{version}-%{release}
@@ -224,6 +222,7 @@
 %patch1 -p1 -b .assistant4
 # don't use -b on mkspec files, else they get installed too.
 %patch2 -p1
+%patch3 -p0 -b .utf8-bug
 %patch0154 -p0 -b .qt-copy#0154
 
 # drop -fexceptions from $RPM_OPT_FLAGS
@@ -561,6 +560,12 @@
 
 
 %changelog
+* Tue Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-8
+- License: GPL, dropping QPL (#237702)
+
+* Thu Mar 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-7
+- CVE-2007-0242, utf8-bug-qt4-2.diff
+
 * Thu Mar 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-6
 - -system-sqlite, BR: sqlite-devel
 - drop mysql_config hackery