From 095ee8470b375a0d3ef64f5b484091008d689dbab83c05e8da6826d5898f62e6 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Tue, 8 Dec 2009 11:48:27 +0000
Subject: [PATCH] checked in

OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=9
---
 fix-build-for-10.0.patch | 36 ++++++++++++++++++++++++++++++++++++
 fontconfig-2.7.0.tar.bz2 |  3 +++
 fontconfig-2.8.0.tar.bz2 |  3 ---
 fontconfig.changes       |  5 -----
 fontconfig.spec          |  4 +++-
 5 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 fix-build-for-10.0.patch
 create mode 100644 fontconfig-2.7.0.tar.bz2
 delete mode 100644 fontconfig-2.8.0.tar.bz2

diff --git a/fix-build-for-10.0.patch b/fix-build-for-10.0.patch
new file mode 100644
index 0000000..9f0c5ab
--- /dev/null
+++ b/fix-build-for-10.0.patch
@@ -0,0 +1,36 @@
+diff -ru fontconfig-2.3.94.orig/configure.in fontconfig-2.3.94/configure.in
+--- fontconfig-2.3.94.orig/configure.in	2006-03-10 15:59:31.000000000 +0100
++++ fontconfig-2.3.94/configure.in	2006-04-04 17:25:40.000000000 +0200
+@@ -300,19 +300,19 @@
+ 	esac
+ fi
+ 
+-#
+-# Check libxml2 configuration
+-#
+-
+-AC_ARG_ENABLE(libxml2,         [  --enable-libxml2              Use libxml2 instead of Expat])
+-
+-if test "$enable_libxml2" = "yes" -o "$expat" = "no"; then
+-    PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6])
+-    AC_DEFINE_UNQUOTED(ENABLE_LIBXML2,1,[Use libxml2 instead of Expat])
+-
+-    AC_SUBST(LIBXML2_CFLAGS)
+-    AC_SUBST(LIBXML2_LIBS)
+-fi
++##
++## Check libxml2 configuration
++##
++#
++#AC_ARG_ENABLE(libxml2,         [  --enable-libxml2              Use libxml2 instead of Expat])
++#
++#if test "$enable_libxml2" = "yes" -o "$expat" = "no"; then
++#    PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6])
++#    AC_DEFINE_UNQUOTED(ENABLE_LIBXML2,1,[Use libxml2 instead of Expat])
++#
++#    AC_SUBST(LIBXML2_CFLAGS)
++#    AC_SUBST(LIBXML2_LIBS)
++#fi
+ 
+ #
+ # Set default font directory
diff --git a/fontconfig-2.7.0.tar.bz2 b/fontconfig-2.7.0.tar.bz2
new file mode 100644
index 0000000..397ce32
--- /dev/null
+++ b/fontconfig-2.7.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5004a4d79f6fb284d73d9f3377f668fca40bf370a0b46c63258223d7fd2e0d09
+size 1251603
diff --git a/fontconfig-2.8.0.tar.bz2 b/fontconfig-2.8.0.tar.bz2
deleted file mode 100644
index aa555e5..0000000
--- a/fontconfig-2.8.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fd7477f7ae1fbbca3e653ba3d294263b62f3019497c4d2df8dc960558f3636c2
-size 1255996
diff --git a/fontconfig.changes b/fontconfig.changes
index 6da841a..904527b 100644
--- a/fontconfig.changes
+++ b/fontconfig.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Mon Dec  7 11:14:35 CET 2009 - pgajdos@suse.cz
-
-- updated to version 2.8.0 (see README)
-
 -------------------------------------------------------------------
 Tue Nov  3 19:09:16 UTC 2009 - coolo@novell.com
 
diff --git a/fontconfig.spec b/fontconfig.spec
index 1718dc0..7690568 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -34,7 +34,7 @@ AutoReqProv:    on
 Obsoletes:      fontconfig-64bit
 %endif
 Requires:       bash
-Version:        2.8.0
+Version:        2.7.0
 Release:        3
 Summary:        Library for Font Configuration
 # CVS can be found here: (CVS is gone, fontconfig uses git now).
@@ -63,6 +63,7 @@ Source30:       29-liberation-aliases.conf
 Patch5:         AppleRoman-DynaFont.patch
 Patch10:        conf.patch
 Patch16:        make-check.patch
+Patch29:        fix-build-for-10.0.patch
 Patch30:        bugzilla-179457-fix-font-file-names-for-wine.patch
 Patch31:        bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch
 Patch32:        usr-share-doc-packages.patch
@@ -120,6 +121,7 @@ Authors:
 %patch5 -p0 -b .dynafont
 %patch10 -p1 -b .fonts.conf
 %patch16 -p1
+#%patch29 -p1
 #%patch30 -p1
 %patch31 -p1
 %patch32 -p1