From 8e12a5519588cc903ac352b8e784254b0a8efda0d54c461cd3130547831855c2 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 27 Nov 2012 10:56:47 +0000 Subject: [PATCH] - updated to 2.10.2: + Fix syntax errors in fonts.dtd. + Bug 57114 - regression on FcFontMatch with namelang + Update CaseFolding.txt to Unicode 6.2 + Bug 57286 - Remove UnBatang and Baekmuk Batang from monospace in 65-nonlatin.conf + Fix N'ko orthography + Install config files first OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=92 --- cloexec.patch | 14 +++++++------- fontconfig-2.10.0.tar.bz2 | 3 --- fontconfig-2.10.2.tar.bz2 | 3 +++ fontconfig-doc-2.10.0.tar.bz2 | 3 --- fontconfig-doc-2.10.2.tar.bz2 | 3 +++ fontconfig.changes | 11 +++++++++++ fontconfig.spec | 7 +++++-- 7 files changed, 29 insertions(+), 15 deletions(-) delete mode 100644 fontconfig-2.10.0.tar.bz2 create mode 100644 fontconfig-2.10.2.tar.bz2 delete mode 100644 fontconfig-doc-2.10.0.tar.bz2 create mode 100644 fontconfig-doc-2.10.2.tar.bz2 diff --git a/cloexec.patch b/cloexec.patch index ca4c9de..ad044bd 100644 --- a/cloexec.patch +++ b/cloexec.patch @@ -2,9 +2,9 @@ Index: configure.ac =================================================================== --- configure.ac.orig +++ configure.ac -@@ -58,7 +58,9 @@ dnl ==================================== - +@@ -59,7 +59,9 @@ dnl ==================================== AC_CONFIG_HEADERS(config.h) + AC_CONFIG_MACRO_DIR([m4]) -AC_PROG_CC +AC_PROG_CC_STDC @@ -13,15 +13,15 @@ Index: configure.ac AC_PROG_INSTALL AC_PROG_LN_S AC_LIBTOOL_WIN32_DLL -@@ -135,7 +137,7 @@ AC_TYPE_PID_T +@@ -136,7 +138,7 @@ AC_TYPE_PID_T # Checks for library functions. AC_FUNC_VPRINTF AC_FUNC_MMAP --AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree posix_fadvise fstatvfs fstatfs]) -+AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree posix_fadvise fstatvfs fstatfs]) +-AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs]) ++AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs]) - # - if test "x$ac_cv_func_fstatvfs" = "xyes"; then + dnl AC_CHECK_FUNCS doesn't check for header files. + dnl posix_fadvise() may be not available in older libc. Index: src/fcatomic.c =================================================================== --- src/fcatomic.c.orig diff --git a/fontconfig-2.10.0.tar.bz2 b/fontconfig-2.10.0.tar.bz2 deleted file mode 100644 index 6919e60..0000000 --- a/fontconfig-2.10.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12c49f2295d2c14eaa2016a96217d88b63ad1923f8702a64d4e62e5df5afe687 -size 1409503 diff --git a/fontconfig-2.10.2.tar.bz2 b/fontconfig-2.10.2.tar.bz2 new file mode 100644 index 0000000..2985873 --- /dev/null +++ b/fontconfig-2.10.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ea8ef56738fd95f0be611015f89614fd4dec79ddac6b3ff26bc4a8338569952 +size 1412488 diff --git a/fontconfig-doc-2.10.0.tar.bz2 b/fontconfig-doc-2.10.0.tar.bz2 deleted file mode 100644 index ef28d68..0000000 --- a/fontconfig-doc-2.10.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8bc453d969a2ff0dbea32160d62c2088c2b2d861dd7f0a8a2fa11d765b4c0ca -size 97573 diff --git a/fontconfig-doc-2.10.2.tar.bz2 b/fontconfig-doc-2.10.2.tar.bz2 new file mode 100644 index 0000000..56fee93 --- /dev/null +++ b/fontconfig-doc-2.10.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:392766d3bb86e4d0186fc833bf2515f9b68970e0c82f2e66d0db21dd0557446a +size 97655 diff --git a/fontconfig.changes b/fontconfig.changes index be4c8a5..b520e54 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Nov 27 09:17:26 UTC 2012 - pgajdos@suse.com + +- updated to 2.10.2: + + Fix syntax errors in fonts.dtd. + + Bug 57114 - regression on FcFontMatch with namelang + + Update CaseFolding.txt to Unicode 6.2 + + Bug 57286 - Remove UnBatang and Baekmuk Batang from monospace in 65-nonlatin.conf + + Fix N'ko orthography + + Install config files first + ------------------------------------------------------------------- Mon Sep 24 10:03:29 UTC 2012 - pgajdos@suse.com diff --git a/fontconfig.spec b/fontconfig.spec index 81a784e..8016638 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -30,7 +30,6 @@ BuildRequires: docbook-utils BuildRequires: docbook_3 BuildRequires: docbook_4 BuildRequires: iso_ent -BuildRequires: jadetex BuildRequires: libpng BuildRequires: libxml2 BuildRequires: libxml2-devel @@ -39,6 +38,8 @@ BuildRequires: openjade BuildRequires: opensp BuildRequires: perl-SGMLS BuildRequires: sgml-skel +BuildRequires: texlive-dvips +BuildRequires: texlive-jadetex %endif Provides: XFree86:%{_sysconfdir}/fonts/fonts.dtd Url: http://fontconfig.org/ @@ -47,7 +48,7 @@ Url: http://fontconfig.org/ Obsoletes: fontconfig-64bit %endif Requires: bash -Version: 2.10.0 +Version: 2.10.2 Release: 0 Summary: Library for Font Configuration License: MIT @@ -55,7 +56,9 @@ Group: System/Libraries Source0: http://fontconfig.org/release/%name-%version.tar.bz2 # After building with "build_docs" defined to "1" generate the doc tarball with: # tar jcf fontconfig-doc.tar.bz2 fc-*/*.[0-9] doc/*.[0-9] doc/*.html doc/*/*.html doc/*.txt +%if %{build_docs} < 1 Source1: %name-doc-%version.tar.bz2 +%endif Source2: iso639-1 Source3: iso639-2 Source4: baselibs.conf