From 9b3d6e78acbec877a8bf619d2abf98f3608e25863de7bcbfd655cbe756e3fe2f Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Tue, 2 Oct 2012 11:44:47 +0000
Subject: [PATCH] - modified %_fontsconfavaildir to from  
 /etc/fonts/conf.avail to /usr/share/%{name}/conf.avail as   fontconfig 2.10
 ship its avail conf in /usr/share/fontconfig/conf.avail - added
 %link_avail_to_system_fontsconf, which creates symlink pointing   from
 /etc/fonts/conf.d to ../../../usr/share/%{name}/conf.avail

OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/fontpackages?expand=0&rev=11
---
 fontpackages.changes    |  9 +++++++++
 fontpackages.spec       |  5 ++---
 rpm-macros.fonts-config | 19 +++++++++++++++++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/fontpackages.changes b/fontpackages.changes
index 509434d..4da0501 100644
--- a/fontpackages.changes
+++ b/fontpackages.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Oct  2 11:33:46 UTC 2012 - pgajdos@suse.com
+
+- modified %_fontsconfavaildir to from
+  /etc/fonts/conf.avail to /usr/share/%{name}/conf.avail as
+  fontconfig 2.10 ship its avail conf in /usr/share/fontconfig/conf.avail
+- added %link_avail_to_system_fontsconf, which creates symlink pointing 
+  from /etc/fonts/conf.d to ../../../usr/share/%{name}/conf.avail
+
 -------------------------------------------------------------------
 Tue Jul  3 13:02:24 UTC 2012 - pgajdos@suse.com
 
diff --git a/fontpackages.spec b/fontpackages.spec
index de01c97..3510b7a 100644
--- a/fontpackages.spec
+++ b/fontpackages.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package fontpackage
+# spec file for package fontpackages
 #
 # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,8 +19,8 @@
 Name:           fontpackages
 Version:        0.1
 Release:        0
-License:        BSD-3-Clause
 Summary:        Commons for Font Packages
+License:        BSD-3-Clause
 Group:          System/Base
 Source0:        rpm-macros.fonts-config
 Source100:      COPYING
@@ -53,4 +53,3 @@ cp -a %{SOURCE0} %{buildroot}%{_sysconfdir}/rpm/macros.fonts-config
 %config %{_sysconfdir}/rpm/macros.fonts-config
 
 %changelog
-
diff --git a/rpm-macros.fonts-config b/rpm-macros.fonts-config
index 8bccf56..d4f5933 100644
--- a/rpm-macros.fonts-config
+++ b/rpm-macros.fonts-config
@@ -4,9 +4,24 @@
 %_miscfontsdir           %{_fontsdir}/misc
 %_fontsconfdir           %{_sysconfdir}/fonts
 %_fontsconfddir          %{_fontsconfdir}/conf.d
-%_fontsconfavaildir      %{_fontsconfdir}/conf.avail
+%_fontsconfavaildir      %{_datadir}/%{name}/conf.avail
 
-# package build macros
+# macro: link_avail_to_system_fontsconf name
+# (takes exactly one argument, name of configuration file)
+# creates symlink pointing from /etc/fonts/conf.d/name to 
+# ../../../usr/share/%{name}/conf.avail/name
+%link_avail_to_system_fontsconf() \
+  if test "x%1" == "x%%1"; then \
+    echo "Missing argument in call to %%link_avail_to_system_fontsconf: name of configuration file." \
+    false \
+  fi \
+  echo "Linking available configuration in %{_fontsconfavaildir}/%1 to %{_fontsconfddir}/%1" \
+  mkdir -p "%{buildroot}%{_fontsconfddir}" \
+  ln -s "../../..%{_fontsconfavaildir}/%1" "%{buildroot}%{_fontsconfddir}" \
+  %nil
+
+# macro: reconfigure_fonts_prereq
+# adds requires for fonts-config
 %reconfigure_fonts_prereq   \
 Requires(pre):		perl aaa_base \
 %nil