Hello community, here is the log from the commit of package fontconfig checked in at Thu Oct 26 20:43:20 CEST 2006. -------- --- fontconfig/fontconfig.changes 2006-10-20 15:21:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/fontconfig/fontconfig.changes 2006-10-24 16:53:59.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Oct 24 16:53:40 CEST 2006 - mfabian@suse.de + +- do not delete cache files for different architectures. + +------------------------------------------------------------------- New: ---- do-not-clean-cache-files-for-different-architectures.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontconfig.spec ++++++ --- /var/tmp/diff_new_pack.An9ua1/_old 2006-10-26 20:41:50.000000000 +0200 +++ /var/tmp/diff_new_pack.An9ua1/_new 2006-10-26 20:41:50.000000000 +0200 @@ -23,7 +23,7 @@ Autoreqprov: on Requires: bash Version: 2.4.1 -Release: 5 +Release: 8 Summary: Library for Font Configuration # CVS can be found here: (CVS is gone, fontconfig uses git now). # $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login @@ -63,6 +63,7 @@ Patch28: bugzilla-158573-turn-off-hinting-when-embolden.patch Patch29: fix-build-for-10.0.patch Patch30: bugzilla-179457-fix-font-file-names-for-wine.patch +Patch31: do-not-clean-cache-files-for-different-architectures.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -113,6 +114,7 @@ %patch28 -p1 #%patch29 -p1 #%patch30 -p1 +%patch31 -p1 %build %define myprefix /usr @@ -180,7 +182,7 @@ %postun -p /sbin/ldconfig %clean -rm -rf $RPM_BUILD_ROOT +#rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) @@ -219,6 +221,8 @@ %{myprefix}/include/fontconfig/ %changelog -n fontconfig +* Tue Oct 24 2006 - mfabian@suse.de +- do not delete cache files for different architectures. * Fri Oct 20 2006 - mfabian@suse.de - Bugzilla #213616: make suse-font-dirs.conf work again by symlinking it into /etc/fonts/conf.d. ++++++ do-not-clean-cache-files-for-different-architectures.patch ++++++ diff -ru fontconfig-2.4.1.orig/fc-cache/fc-cache.c fontconfig-2.4.1/fc-cache/fc-cache.c --- fontconfig-2.4.1.orig/fc-cache/fc-cache.c 2006-09-14 03:53:49.000000000 +0200 +++ fontconfig-2.4.1/fc-cache/fc-cache.c 2006-10-24 16:50:35.000000000 +0200 @@ -22,6 +22,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#include "../fc-arch/fcarch.h" + #ifdef HAVE_CONFIG_H #include <config.h> #else @@ -296,6 +298,11 @@ if (ent->d_name[0] == '.') continue; + /* skip cache files for different architectures and */ + /* files which are not cache files at all */ + if (!strstr(ent->d_name, "-" FC_ARCHITECTURE FC_CACHE_SUFFIX)) + continue; + file_name = FcStrPlus (dir_base, (FcChar8 *) ent->d_name); if (!file_name) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org