[packages/fonts-OTF-Cantarell] Switch to new fontconfig directory structure Release 3

[baggins]

commit f9ceff51d6fed362432a9520ddb483db960235d2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Aug 9 11:20:35 2012 +0200

    Switch to new fontconfig directory structure
    Release 3

 fonts-OTF-Cantarell.spec | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/fonts-OTF-Cantarell.spec b/fonts-OTF-Cantarell.spec
index 84ecb93..6d3aed1 100644
--- a/fonts-OTF-Cantarell.spec
+++ b/fonts-OTF-Cantarell.spec
@@ -2,7 +2,7 @@ Summary:	Cantarell fonts
 Summary(pl.UTF-8):	Fonty Cantarell
 Name:		fonts-OTF-Cantarell
 Version:	0.0.9
-Release:	2
+Release:	3
 License:	OFL v1.1
 Group:		Fonts
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/cantarell-fonts/0.0/cantarell-fonts-%{version}.tar.xz
@@ -11,6 +11,7 @@ URL:		http://abattis.org/cantarell/
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 Requires(post,postun):	fontpostinst
+Requires:	fontconfig >= 1:2.10.1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -34,12 +35,12 @@ Jest to rodzina krojów bezszeryfowych Humanist.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_otffontsdir}
-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 otf/*.otf $RPM_BUILD_ROOT%{_otffontsdir}
-cp fontconfig/31-cantarell.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail
-ln -s ../conf.avail/31-cantarell.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+cp fontconfig/31-cantarell.conf $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail
+ln -s %{_datadir}/fontconfig/conf.avail/31-cantarell.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,6 +54,6 @@ fontpostinst OTF
 %files
 %defattr(644,root,root,755)
 %doc COPYING NEWS README
-%{_sysconfdir}/fonts/conf.avail/31-cantarell.conf
+%{_datadir}/fontconfig/conf.avail/31-cantarell.conf
 %{_sysconfdir}/fonts/conf.d/31-cantarell.conf
 %{_otffontsdir}/Cantarell-*.otf