sync w/devel (new khtml patch)

This commit is contained in:
Rex Dieter 2009-10-08 18:29:53 +00:00
parent 70df5626e6
commit 6706557c13
3 changed files with 6 additions and 3 deletions

View File

@ -12,4 +12,3 @@ if ( -f /etc/sysconfig/prelink ) then
endif
unset PRELINKING
endif

View File

@ -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

View File

@ -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 <rdieter@fedoraproject.org> - 4.3.2-3
- khtml kpart crasher (kde #207173/209876)
* Wed Oct 07 2009 Than Ngo <than@redhat.com> - 4.3.2-2
- fix a deadlock in KLocale