fontconfig:

- install/enable 70-prefer-ja-font.conf and 59-morisawa-font-alias.conf (again)
- enable 25-unhint-nonlatin.conf (again)
- add patch0-2 from fedora package
  - patch0: less sleep in fc-cache
  - patch1: fix font matching issue
  - patch2: fix web font issue in firefox

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7657 ec354946-7b23-47d6-9f5a-488ba84defc7

f/fontconfig/fontconfig-vl.spec

@@ -5,7 +5,7 @@ Summary: Font configuration and customization library
 Summary(ja): フォント設定/カスタマイズライブラリ
 Name: fontconfig
 Version: 2.10.92
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
 URL: http://fontconfig.org/
@@ -14,6 +14,15 @@ Source: http://fontconfig.org/release/fontconfig-%{version}.tar.bz2
 Source10: 70-prefer-ja-font.conf
 Source11: 59-morisawa-font-alias.conf
 
+# from fedora
+# https://bugzilla.redhat.com/show_bug.cgi?id=140335
+Patch0:         fontconfig-2.8.0-sleep-less.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=929372
+Patch1:         %{name}-929372.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=946859
+Patch2:         %{name}-fix-woff.patch
+
+# vine
 Patch4: fontconfig-2.3.2-subst-ja-font.patch
 Patch10: fontconfig-2.6.0-vine.patch
 
@@ -93,6 +102,11 @@ fontconfig-devel パッケージには fontconfig を使ったソフトウエア
 
 %prep
 %setup -q
+
+%patch0 -p1 -b .sleep-less
+%patch1 -p1 -b .929372
+%patch2 -p1 -b .fix-woff
+
 %patch4 -p1 -b .subst-ja-font
 %patch10 -p1 -b .vine
 
@@ -111,11 +125,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %__make install DESTDIR=$RPM_BUILD_ROOT
 
-#ln -s ../conf.avail/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s %{_datadir}/fontconfig/conf.avail/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
-#install -m664 %{SOURCE10} %{SOURCE11} $RPM_BUILD_ROOT/%{_sysconfdir}/fonts/conf.avail/
+install -m664 %{SOURCE10} %{SOURCE11} $RPM_BUILD_ROOT/%{_datadir}/fontconfig/conf.avail/
 for i in 70-prefer-ja-font.conf 59-morisawa-font-alias.conf
 do
-  ln -sf ../conf.avail/$i $RPM_BUILD_ROOT/%{_sysconfdir}/fonts/conf.d/
+  ln -sf %{_datadir}/fontconfig/conf.avail/$i $RPM_BUILD_ROOT/%{_sysconfdir}/fonts/conf.d/
 done
 
 # move installed doc files back to build directory to package themm
@@ -193,6 +207,14 @@ HOME=/root /usr/bin/fc-cache -f -s >& /dev/null
 %endif
 
 %changelog
+* Tue May 07 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 2.10.92-2
+- install/enable 70-prefer-ja-font.conf and 59-morisawa-font-alias.conf (again)
+- enable 25-unhint-nonlatin.conf (again)
+- add patch0-2 from fedora package
+  - patch0: less sleep in fc-cache
+  - patch1: fix font matching issue
+  - patch2: fix web font issue in firefox
+
 * Wed Apr 17 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.10.92-1
 - new upstream release
 - remove Patch1 (fontconfig-2.2.1-AppleRoman-DynaFont.patch)