[packages/fonts-TTF-Google-Droid] Switch to new fontconfig directory structure Release 2

[baggins]

commit 73a0ecab4de79e2ee4ab3a6c04d241fdf17c2d41
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Aug 9 11:23:34 2012 +0200

    Switch to new fontconfig directory structure
    Release 2

 fonts-TTF-Google-Droid.spec | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/fonts-TTF-Google-Droid.spec b/fonts-TTF-Google-Droid.spec
index 5c6601a..c94bcd1 100644
--- a/fonts-TTF-Google-Droid.spec
+++ b/fonts-TTF-Google-Droid.spec
@@ -1,7 +1,7 @@
 Summary:	General-purpose fonts released by Google as part of Android
 Name:		fonts-TTF-Google-Droid
 Version:	1.0.0.112
-Release:	1
+Release:	2
 License:	Apache v2.0
 Group:		Fonts
 Source0:	google-droid.tar.gz
@@ -12,6 +12,7 @@ Source3:	%{name}-serif.fontconfig
 URL:		http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts
 Requires(post,postun):	fontpostinst
 Requires:	%{_fontsdir}/TTF
+Requires:	fontconfig >= 1:2.10.1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -31,16 +32,16 @@ rm -f Ahem.ttf
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_ttffontsdir}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail
+install -d $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 
 cp -a *.ttf $RPM_BUILD_ROOT%{_ttffontsdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/65-droid-sans.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/60-droid-sans-mono.conf
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/59-droid-serif.conf
-ln -s ../conf.avail/65-droid-sans.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
-ln -s ../conf.avail/60-droid-sans-mono.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
-ln -s ../conf.avail/59-droid-serif.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/65-droid-sans.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/60-droid-sans-mono.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/59-droid-serif.conf
+ln -s %{_datadir}/fontconfig/conf.avail/65-droid-sans.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s %{_datadir}/fontconfig/conf.avail/60-droid-sans-mono.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s %{_datadir}/fontconfig/conf.avail/59-droid-serif.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,9 +55,9 @@ fontpostinst TTF
 %files
 %defattr(644,root,root,755)
 %{_ttffontsdir}/Droid*.ttf
-%{_sysconfdir}/fonts/conf.avail/65-droid-sans.conf
-%{_sysconfdir}/fonts/conf.avail/60-droid-sans-mono.conf
-%{_sysconfdir}/fonts/conf.avail/59-droid-serif.conf
-%{_sysconfdir}/fonts/conf.d/65-droid-sans.conf
-%{_sysconfdir}/fonts/conf.d/60-droid-sans-mono.conf
+%{_datadir}/fontconfig/conf.avail/59-droid-serif.conf
+%{_datadir}/fontconfig/conf.avail/60-droid-sans-mono.conf
+%{_datadir}/fontconfig/conf.avail/65-droid-sans.conf
 %{_sysconfdir}/fonts/conf.d/59-droid-serif.conf
+%{_sysconfdir}/fonts/conf.d/60-droid-sans-mono.conf
+%{_sysconfdir}/fonts/conf.d/65-droid-sans.conf