From 68e1ef6284fcb5a0b41b289572e7c69e7ce1abb3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 16 May 2010 18:48:51 +0000 Subject: [PATCH] sync w/devel --- kdelibs.spec | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/kdelibs.spec b/kdelibs.spec index 1df6bff..248fd90 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -8,7 +8,7 @@ Summary: KDE Libraries Version: 4.4.3 -Release: 2%{?dist} +Release: 5%{?dist} Name: kdelibs Epoch: 6 @@ -72,7 +72,7 @@ Patch11: kdelibs-4.3.80-policykit-workaround.patch Patch12: kdelibs-4.1.0-xdg-menu.patch # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec Patch14: kdelibs-4.2.85-libexecdir.patch -# kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4 +# kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir} Patch18: kdelibs-4.1.72-kstandarddirs.patch # COMMENT ME PLEASE Patch20: kdelibs-4.1.70-cmake.patch @@ -99,6 +99,7 @@ Conflicts: kdebase-workspace-libs < 4.3.80 %endif BuildRequires: qt4-devel >= 4.6.0 +BuildRequires: qt4-webkit-devel %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} Requires: xdg-utils Requires(post): /sbin/ldconfig @@ -194,6 +195,7 @@ Provides: nepomuk-devel = %{version}-%{release} # considered part of nepomuk-devel Requires: shared-desktop-ontologies-devel soprano-devel Requires: qt4-devel +Requires: qt4-webkit-devel # do we really still need all these below? -- Rex Requires: strigi-devel Requires: bzip2-devel gamin-devel libacl-devel @@ -365,7 +367,24 @@ rm -rf %{buildroot} %{_kde4_libdir}/kconf_update_bin/ %dir %{_kde4_libdir}/kde4/ %{_kde4_libdir}/kde4/*.so -%{_kde4_libexecdir}/* +%{_kde4_libexecdir}/filesharelist +%{_kde4_libexecdir}/fileshareset +%{_kde4_libexecdir}/kauth-policy-gen +%{_kde4_libexecdir}/kcmremotewidgetshelper +%{_kde4_libexecdir}/kconf_update +%{_kde4_libexecdir}/kdesu_stub +%{_kde4_libexecdir}/kdontchangethehostname +%{_kde4_libexecdir}/kio_http_cache_cleaner +%{_kde4_libexecdir}/kioslave +%{_kde4_libexecdir}/klauncher +%{_kde4_libexecdir}/kmailservice +# see kio/misc/kpac/README.wpad +%attr(4755,root,root) %{_kde4_libexecdir}/kpac_dhcp_helper +%{_kde4_libexecdir}/ksendbugmail +%{_kde4_libexecdir}/ktelnetservice +%{_kde4_libexecdir}/lnusertemp +%{_kde4_libexecdir}/start_kdeinit +%{_kde4_libexecdir}/start_kdeinit_wrapper %{_kde4_libdir}/kde4/plugins/ %{_kde4_sysconfdir}/xdg/menus/*.menu %{_mandir}/man1/checkXML.1* @@ -429,6 +448,15 @@ rm -rf %{buildroot} %changelog +* Sun May 16 2010 Rex Dieter 6:4.4.3-5 +- Web proxy auto-discovery (WPAD) fails (#592658) + +* Sat May 08 2010 Rex Dieter 6:4.4.3-4 +- -devel: Req: qt4-webkit-devel + +* Sat May 08 2010 Rex Dieter 6:4.4.3-3 +- BR: qt4-webkit-devel + * Wed May 05 2010 Than Ngo - 6:4.4.3-2 - respin