From b8e988fb7bf37bb1793a99c6c80886f5c69c7614 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@fedoraproject.org>
Date: Fri, 16 Jan 2009 05:53:21 +0000
Subject: [PATCH] - Update to 2.6.90-1.git.63.g6bb4b9a - Remove upstreamed
 patch

---
 fontconfig-2.6.0-indic.patch | 63 ------------------------------------
 fontconfig.spec              |  8 ++---
 2 files changed, 3 insertions(+), 68 deletions(-)
 delete mode 100644 fontconfig-2.6.0-indic.patch

diff --git a/fontconfig-2.6.0-indic.patch b/fontconfig-2.6.0-indic.patch
deleted file mode 100644
index 98a897a..0000000
--- a/fontconfig-2.6.0-indic.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- conf.d/65-nonlatin.conf	2008-05-04 08:06:25.000000000 +0530
-+++ conf.d/65-nonlatin.conf.new	2008-09-26 17:38:38.000000000 +0530
-@@ -49,9 +49,16 @@
- 			<family>Lohit Bengali</family>
-  			<family>Lohit Gujarati</family>
-  			<family>Lohit Hindi</family>
-+			<family>Lohit Marathi</family>
-+			<family>Lohit Maithili</family>
-+			<family>Lohit Kashmiri</family>
-+			<family>Lohit Konkani</family>
-+			<family>Lohit Nepali</family>
-+			<family>Lohit Sindhi</family>
-  			<family>Lohit Punjabi</family>
-  			<family>Lohit Tamil</family>
-- 			<family>Lohit Malayalam</family>
-+ 			<family>Meera</family>
-+			<family>Lohit Malayalam</family>
-  			<family>Lohit Kannada</family>
-  			<family>Lohit Telugu</family>
-  			<family>Lohit Oriya</family>
-@@ -111,8 +118,15 @@
- 			<family>Lohit Bengali</family>
-  			<family>Lohit Gujarati</family>
-  			<family>Lohit Hindi</family>
-+			<family>Lohit Marathi</family>
-+			<family>Lohit Maithili</family>
-+			<family>Lohit Kashmiri</family>
-+			<family>Lohit Konkani</family>
-+			<family>Lohit Nepali</family>
-+			<family>Lohit Sindhi</family>
-  			<family>Lohit Punjabi</family>
-  			<family>Lohit Tamil</family>
-+			<family>Meera</family>
-  			<family>Lohit Malayalam</family>
-  			<family>Lohit Kannada</family>
-  			<family>Lohit Telugu</family>
-@@ -153,13 +167,20 @@
- 			<family>Lohit Bengali</family>
- 			<family>Lohit Gujarati</family>
- 			<family>Lohit Hindi</family>
-+			<family>Lohit Marathi</family>
-+			<family>Lohit Maithili</family>
-+			<family>Lohit Kashmiri</family>
-+			<family>Lohit Konkani</family>
-+			<family>Lohit Nepali</family>
-+			<family>Lohit Sindhi</family>
- 			<family>Lohit Punjabi</family>
-- 			<family>Lohit Tamil</family>
-- 			<family>Lohit Malayalam</family>
-- 			<family>Lohit Kannada</family>
-- 			<family>Lohit Telugu</family>
-- 			<family>Lohit Oriya</family>
-- 			<family>LKLUG</family>
-+			<family>Lohit Tamil</family>
-+			<family>Meera</family>
-+			<family>Lohit Malayalam</family>
-+			<family>Lohit Kannada</family>
-+			<family>Lohit Telugu</family>
-+			<family>Lohit Oriya</family>
-+			<family>LKLUG</family>
- 		</prefer>
- 	</alias>
- </fontconfig>
diff --git a/fontconfig.spec b/fontconfig.spec
index be45619..0f3f24d 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.6.90
-Release: 1.git.63.g6bb4b9a%{?dist}
+Release: 2.git.63.g6bb4b9a%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -23,8 +23,6 @@ Conflicts: fonts-hebrew < 0.100
 # reference the new path in %%configure
 Conflicts: fonts-xorg-base, fonts-xorg-syriac
 
-Patch0: fontconfig-2.6.0-indic.patch
-
 %description
 Fontconfig is designed to locate fonts within the
 system and select them according to requirements specified by 
@@ -46,7 +44,6 @@ will use fontconfig.
 
 %prep
 %setup -q
-%patch0 -p0 -b .indic
 
 %build
 
@@ -132,8 +129,9 @@ fi
 %{_mandir}/man3/*
 
 %changelog
-* Fri Jan 16 2009 Behdad Esfahbod <besfahbo@redhat.com> - 2.6.90-1.git.63.g6bb4b9a
+* Fri Jan 16 2009 Behdad Esfahbod <besfahbo@redhat.com> - 2.6.90-2.git.63.g6bb4b9a
 - Update to 2.6.90-1.git.63.g6bb4b9a
+- Remove upstreamed patch
 
 * Mon Oct 20 2008 Behdad Esfahbod <besfahbo@redhat.com> - 2.6.0-3
 - Add fontconfig-2.6.0-indic.patch