From 6706557c134c9ad859a8ca24c12f8048816d396f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 8 Oct 2009 18:29:53 +0000 Subject: [PATCH] sync w/devel (new khtml patch) --- kde4.csh | 1 - kde4.sh | 1 - kdelibs.spec | 7 ++++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kde4.csh b/kde4.csh index 0a464b1..4a24a68 100755 --- a/kde4.csh +++ b/kde4.csh @@ -12,4 +12,3 @@ if ( -f /etc/sysconfig/prelink ) then endif unset PRELINKING endif - diff --git a/kde4.sh b/kde4.sh index a4662f8..e011555 100755 --- a/kde4.sh +++ b/kde4.sh @@ -9,4 +9,3 @@ if [ -z "$KDE_IS_PRELINKED" ] ; then grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \ KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED fi - diff --git a/kdelibs.spec b/kdelibs.spec index b5a1e00..c92b9df 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -4,7 +4,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Name: kdelibs Epoch: 6 @@ -80,6 +80,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch # upstream # 4.3 branch Patch100: kdelibs-4.3.2-kde#209712.patch +Patch101: kdelibs-4.3.2-kde#207173.patch # security fix Patch200: kdelibs-4.3.1-CVE-2009-2702.patch @@ -203,6 +204,7 @@ format for easy browsing. # upstream patches # 4.3 %patch100 -p0 -b .kde#209712 +%patch101 -p4 -b .kde#207173.patch # security fix %patch200 -p1 -b .CVE-2009-2702 @@ -395,6 +397,9 @@ rm -rf %{buildroot} %changelog +* Thu Oct 08 2009 Rex Dieter - 4.3.2-3 +- khtml kpart crasher (kde #207173/209876) + * Wed Oct 07 2009 Than Ngo - 4.3.2-2 - fix a deadlock in KLocale