diff --git a/kdelibs.spec b/kdelibs.spec index dbc62e0..110f946 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -151,8 +151,13 @@ Patch60: kdelibs-udisks2_2_stage.patch Patch200: kdelibs-4.10.0-CVE-2009-2702.patch # rhel patches + +# disable webkit Patch300: kdelibs-4.10.0-webkit.patch +# set abrt default +Patch301: kdelibs-4.x-abrt.patch + # kmailservice/ktelnetservice moved here Conflicts: kdelibs3 < 3.5.10-42 @@ -322,6 +327,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage # rhel patches %if 0%{?rhel} %patch300 -p1 -b .webkit +%patch301 -p1 -b .abrt %endif %build @@ -556,7 +562,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog * Thu Feb 28 2013 Than Ngo - 6:4.10.0-4 -- adapt webkit patch +- rhel condition: + adapt webkit patch + abrt by default * Thu Feb 07 2013 Lukáš Tinkl 6:4.10.0-3 - complete kdelibs-udisks2_2_stage.patch