[packages/xorg-font-font-bh-ttf] Switch to new fontconfig direcotry structure Release 2

[baggins]

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

    Switch to new fontconfig direcotry structure
    Release 2

 fontconfig-2.10.patch      | 20 ++++++++++++++++++++
 xorg-font-font-bh-ttf.spec |  7 +++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
---
diff --git a/fontconfig-2.10.patch b/fontconfig-2.10.patch
new file mode 100644
index 0000000..9ff5367
--- /dev/null
+++ b/fontconfig-2.10.patch
@@ -0,0 +1,20 @@
+--- font-bh-ttf-1.0.3/Makefile.am~	2010-10-09 01:59:49.000000000 +0200
++++ font-bh-ttf-1.0.3/Makefile.am	2012-08-09 11:46:35.455350161 +0200
+@@ -37,7 +37,7 @@
+ font_DATA = $(FONT_FILES)
+ 
+ actualconfigdir = $(FC_CONFDIR)/conf.d
+-availconfigdir = $(FC_CONFDIR)/conf.avail
++availconfigdir = $(datadir)/fontconfig/conf.avail
+ dist_availconfig_DATA = 42-luxi-mono.conf
+ 
+ EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH
+@@ -51,7 +51,7 @@
+ 	$(MKFONTDIR) $(DESTDIR)$(fontdir)
+ 	mkdir -p $(DESTDIR)$(actualconfigdir)
+ 	@rm -f $(DESTDIR)$(actualconfigdir)/$(dist_availconfig_DATA)
+-	ln -s ../conf.avail/$(dist_availconfig_DATA) $(DESTDIR)$(actualconfigdir)
++	ln -s $(availconfigdir)/$(dist_availconfig_DATA) $(DESTDIR)$(actualconfigdir)
+ 	@RUN_FCCACHE@
+ 
+ distuninstallcheck:
diff --git a/xorg-font-font-bh-ttf.spec b/xorg-font-font-bh-ttf.spec
index e2fcaf3..4284158 100644
--- a/xorg-font-font-bh-ttf.spec
+++ b/xorg-font-font-bh-ttf.spec
@@ -2,11 +2,12 @@ Summary:	Bigelow & Holmes Luxi font in TrueType format
 Summary(pl.UTF-8):	Font Bigelow & Holmes Luxi w formacie TrueType
 Name:		xorg-font-font-bh-ttf
 Version:	1.0.3
-Release:	1
+Release:	2
 License:	distributable if unmodified
 Group:		Fonts
 Source0:	http://xorg.freedesktop.org/releases/individual/font/font-bh-ttf-%{version}.tar.bz2
 # Source0-md5:	e8ca58ea0d3726b94fe9f2c17344be60
+Patch0:		fontconfig-2.10.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -17,6 +18,7 @@ BuildRequires:	xorg-font-font-util >= 1.2
 BuildRequires:	xorg-util-util-macros >= 1.3
 Requires(post,postun):	fontpostinst
 Requires:	%{_fontsdir}/TTF
+Requires:	fontconfig >= 1:2.10.1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -28,6 +30,7 @@ Font Bigelow & Holmes Luxi w formacie TrueType.
 
 %prep
 %setup -q -n font-bh-ttf-%{version}
+%patch0 -p1
 
 %build
 %{__aclocal}
@@ -59,5 +62,5 @@ fontpostinst TTF
 %defattr(644,root,root,755)
 %doc COPYING ChangeLog README
 %{_fontsdir}/TTF/luxi*.ttf
-/etc/fonts/conf.avail/42-luxi-mono.conf
+%{_datadir}/fontconfig/conf.avail/42-luxi-mono.conf
 %config(noreplace,missingok) %verify(not link md5 mtime size) /etc/fonts/conf.d/42-luxi-mono.conf