Hello community, here is the log from the commit of package kdelibs3 for openSUSE:Factory checked in at 2014-01-13 10:53:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs3 (Old) and /work/SRC/openSUSE:Factory/.kdelibs3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs3" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs3/kdelibs3.changes 2013-11-23 08:14:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs3.new/kdelibs3.changes 2014-01-13 10:53:14.000000000 +0100 @@ -1,0 +2,21 @@ +Sat Jan 11 07:45:33 UTC 2014 - co...@suse.com + +- work around toolchain issue reported on + http://lists.opensuse.org/opensuse-packaging/2014-01/msg00010.html + + Once binutils and glibc maintainers agree on where the bug is, + we can reenable as_needed + +------------------------------------------------------------------- +Wed Jan 8 13:53:33 UTC 2014 - adr...@suse.de + +- use gamin-devel instead of unmaintained fam(-devel) package + +------------------------------------------------------------------- +Wed Dec 18 09:28:43 UTC 2013 - an...@opensuse.org + +- fix KDE Help Center using a suggested patch from + KDE bug tacker (KDE bug 209415). The help center now works again! + kdelibs-fix-htdig.diff + +------------------------------------------------------------------- New: ---- kdelibs-fix-htdig.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.9ZkJ3y/_old 2014-01-13 10:53:16.000000000 +0100 +++ /var/tmp/diff_new_pack.9ZkJ3y/_new 2014-01-13 10:53:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdelibs3 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,9 +24,9 @@ BuildRequires: avahi-compat-mDNSResponder-devel BuildRequires: cups-devel BuildRequires: db-devel -BuildRequires: fam-devel BuildRequires: fdupes BuildRequires: flac-devel +BuildRequires: gamin-devel BuildRequires: krb5-devel BuildRequires: libacl-devel BuildRequires: libart_lgpl-devel @@ -200,6 +200,7 @@ Patch226: initialise-mCrossDomain-fix.diff Patch227: kdelibs-kactionselector-multiple-item-movement.patch Patch228: merge-svn-diff.patch +Patch229: kdelibs-fix-htdig.diff %description This package contains kdelibs, one of the basic packages of the K @@ -274,7 +275,7 @@ Summary: KDE Base Package: Build Environment Group: System/GUI/KDE Requires: arts-devel -Requires: fam-devel +Requires: gamin-devel Requires: libidn-devel Requires: pcre-devel @@ -402,6 +403,7 @@ %patch225 -p1 %patch226 -p1 %patch227 -p1 +%patch229 -p1 # disable a debug feature sed -i 's|#define KICONLOADER_CHECKS||g' kdecore/kiconloader.cpp @@ -421,6 +423,8 @@ %build export PATH=$PWD/admin/:$PATH +# work around for http://lists.opensuse.org/opensuse-packaging/2014-01/msg00010.html +export SUSE_ASNEEDED=0 FINAL="--enable-final" CFLAGS="$CFLAGS -fno-strict-aliasing" CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" @@ -439,7 +443,7 @@ --with-ssl-dir=/usr/ssl \ --mandir=%_mandir \ --sysconfdir=%_sysconfdir \ - --enable-new-ldflags" + --disable-new-ldflags" # # common_options # @@ -694,9 +698,6 @@ %verifyscript %verify_permissions -e /opt/kde3/bin/kpac_dhcp_helper -%clean - rm -rf ${RPM_BUILD_ROOT} - %files default-style %defattr(-,root,root) %doc AUTHORS COPYING COPYING.BSD COPYING.LIB NAMING README ++++++ kdelibs-fix-htdig.diff ++++++ commit 2259d55a3971d050e40234a92d9753143cab0e09 Author: Timothy Pearson <kb9...@pearsoncomputing.net> Date: 1387079758 -0600 Fix htdig index build failure using suggested patch from KDE bug 209415 This relates to Bug 370 diff --git a/kdoctools/customization/htdig_index.xsl b/kdoctools/customization/htdig_index.xsl index 7aa9113..4d47982 100644 --- a/kdoctools/customization/htdig_index.xsl +++ b/kdoctools/customization/htdig_index.xsl @@ -35,7 +35,7 @@ </entry> </xsl:template> -<xsl:template match="sect*/title|emphasis"> +<xsl:template match="*[starts-with(local-name(), 'sect')]/title|emphasis"> <entry header="2"> <xsl:apply-templates/> </entry> -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
