From 7b221934e7f641ce009c1498f284d479ae1d1e35 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 06:55:32 +0000
Subject: [PATCH] auto-import kdelibs-3.0.3-0.7.1  from
 kdelibs-3.0.3-0.7.1.src.rpm

---
 kdelibs.spec | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/kdelibs.spec b/kdelibs.spec
index 89e3266..bff3908 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -2,7 +2,7 @@
 %define is_release 1
 %define beta %{nil}
 %define cups cups
-%define rel 0.7
+%define rel 0.7.1
 %define debug 0
 %define DATE 20020327
 Version: 3.0.3
@@ -20,12 +20,17 @@ Patch2: kdelibs-3.0.0-i18nfix.patch
 Patch6: kdelibs-3.0-noxs.patch
 Patch7: kdelibs-3.0.0-ndebug.patch
 Patch8: kdelibs-3.0-resize-icons.patch
+Patch9: kdelibs-3.0.2-katetextbuffermultibyte.patch
 Patch11: kdelibs-2.1.1-path.patch
+Patch12: kdelibs-3.0.2-ksyscoca.patch
 Patch13: kdelibs-3.0-rpath.patch
+Patch14: post-3.0.3-kdelibs-khtml.diff
+Patch15: kdelibs-3.0.3-alignment.patch
 # Japanese patches
 Patch101: http://www.kde.gr.jp/patch/kdelibs-2.2.2-khtml-autoencode-ja-20011126.diff
 Name: kdelibs
-Requires: qt >= 3.0.3 arts >= 7:1.0.0-3
+Requires: qt >= 3.0.3
+Requires: arts >= 7:1.0.2-1
 %if "%{cups}" != ""
 Requires: cups-libs >= 1.1.12
 BuildRequires: cups-devel >= 1.1.12
@@ -33,7 +38,9 @@ BuildRequires: cups-devel >= 1.1.12
 BuildRequires: qt-devel >= 3.0.5
 Obsoletes: %{name}2 kdelibs-sound
 BuildPrereq: flex >= 2.5.4a-13 kdoc >= 3.0.0 libxslt-devel >= 1.0.9
-BuildPrereq: sgml-common openjade jadetex docbook-dtd31-sgml docbook-style-dsssl perl-SGMLSpm docbook-utils pcre-devel zlib-devel arts-devel >= 7:1.0.3
+BuildPrereq: sgml-common openjade jadetex docbook-dtd31-sgml docbook-style-dsssl perl-SGMLSpm docbook-utils pcre-devel zlib-devel arts-devel >= 7:1.0.2
+BuildPrereq: audiofile-devel
+BuildPrereq: openssl-devel
 Icon: kde-icon.xpm
 Epoch: 6
 %if %{is_release}
@@ -89,7 +96,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %patch6 -p1 -b .noxs
 %patch8 -p1 -b .resize
+%patch9 -p1 -b .buffermultibyte
 %patch11 -p1 -b .path
+%patch12 -p1 -b .ksyscoca
+pushd khtml
+%patch14 -p0 -b .securiy
+popd
+%patch15 -p1 -b .aligment
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release}\"," kdecore/kdeversion.h
 
@@ -159,7 +172,7 @@ make %{?_smp_mflags}
 %install
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export DESTDIR=$RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install-strip
+make DESTDIR=$RPM_BUILD_ROOT install
 
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/*
 
@@ -217,7 +230,7 @@ if [ "0`./gccver`" -lt 3001 ]; then
 fi
 
 %clean
-# rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
@@ -309,7 +322,15 @@ fi
 %doc %{_docdir}/%{name}-devel-%{version}/*
 
 %changelog
-* Mon Aug 12 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-1
+* Mon Sep 30 2002 Than Ngo <than@redhat.com> 3.0.3-0.7.1
+- Konqueror SSL vulnerability
+- Secure Cookie Vulnerability
+- Konqueror Cross Site Scripting Vulnerability
+- Fixed a bug in ktip
+- Added ksyscoca patch from Harald Hoyer
+- Added katetextbuffermultibyte patch from Leon Ho (bug #61464)
+
+* Mon Aug 12 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-0.7
 - 3.0.3
 
 * Mon Apr 15 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-10