rpms/charis-fonts/devel charis-fonts-fontconfig.conf, 1.1, 1.2 charis-fonts.spec, 1.6, 1.7

[Nicolas Mailhot (nim)]

Author: nim

Update of /cvs/extras/rpms/charis-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23157/devel

Modified Files:
	charis-fonts-fontconfig.conf charis-fonts.spec 
Log Message:
new fontconfig syntax


Index: charis-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/charis-fonts/devel/charis-fonts-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- charis-fonts-fontconfig.conf	31 May 2007 18:20:12 -0000	1.1
+++ charis-fonts-fontconfig.conf	1 Nov 2007 18:23:05 -0000	1.2
@@ -1,5 +1,5 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <!-- /etc/fonts/conf.d/60-charis.conf
 
      Define settings for Charis SIL fonts
@@ -7,24 +7,20 @@
      © 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 -->
 <fontconfig>
-  <!-- Declare Charis SIL a valid Charis SIL Literacy & Bitstream Charter substitute -->
-  <match>
-    <test name="family">
-      <string>Charis SIL Literacy</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>Charis SIL</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Bitstream Charter</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>Charis SIL</string>
-    </edit>
-  </match>
-  <!-- Assign generic name -->
+  <!-- Font substitution rules -->
+  <alias binding="same">
+    <family>Bitstream Charter</family>
+    <accept>
+      <family>Charis SIL</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Charis SIL Literacy</family>
+    <accept>
+      <family>Charis SIL</family>
+    </accept>
+  </alias>
+  <!-- Generic name aliasing -->
   <alias>
     <family>Charis SIL</family>
     <default>


Index: charis-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/charis-fonts/devel/charis-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- charis-fonts.spec	28 Aug 2007 20:17:58 -0000	1.6
+++ charis-fonts.spec	1 Nov 2007 18:23:05 -0000	1.7
@@ -1,23 +1,23 @@
-%define fontname        charis
-%define fontdir         %{_datadir}/fonts/%{fontname}/
-%define fontconfdir     %{_sysconfdir}/fonts/conf.d/
-
-%define archivename     CharisSIL%{version}
-
-Name:      %{fontname}-fonts
-Version:   4.100
-Release:   3%{?alphatag}%{?dist}
-Summary:   Charis SIL fonts
-
-Group:     User Interface/X
-License:   OFL
-URL:       http://scripts.sil.org/CharisSILFont
+%define fontname    charis
+%define fontdir     %{_datadir}/fonts/%{fontname}
+%define fontconfdir %{_sysconfdir}/fonts/conf.d
+
+%define archivename CharisSIL%{version}
+
+Name:    %{fontname}-fonts
+Version: 4.100
+Release: 4%{?alphatag}%{?dist}
+Summary: Charis SIL fonts
+
+Group:   User Interface/X
+License: OFL
+URL:     http://scripts.sil.org/CharisSILFont
 # Actual download URL
 # http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=%{archivename}.zip&filename=%{archivename}.zip
-Source0:   %{archivename}.zip
-Source1:   %{name}-fontconfig.conf
+Source0: %{archivename}.zip
+Source1: %{name}-fontconfig.conf
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 
 %description
@@ -31,21 +31,25 @@
 
 
 %prep
-%setup -q -c
-sed -i 's/\r//' *.txt
+%setup -c -q
+for txt in *.txt ; do
+   fold -s $txt > $txt.new
+   sed -i 's/\r//' $txt.new
+   touch -r $txt $txt.new
+   mv $txt.new $txt
+done
 
 
 %build
+# Source format not available
 
 
 %install
 rm -fr %{buildroot}
 
-# Fonts
 install -m 0755 -d %{buildroot}%{fontdir}
 install -m 0644 -p *.ttf %{buildroot}%{fontdir}
 
-# Fontconfig tweaks
 install -m 0755 -d %{buildroot}%{fontconfdir}
 install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}60-%{fontname}.conf
 
@@ -56,22 +60,21 @@
 
 %post
 if [ -x %{_bindir}/fc-cache ]; then
-  %{_bindir}/fc-cache %{fontdir}
+   %{_bindir}/fc-cache -f %{fontdir}
 fi
 
 
 %postun
 if [ "$1" = "0" ]; then
-  if [ -x %{_bindir}/fc-cache ]; then
-    %{_bindir}/fc-cache %{fontdir}
-  fi
+   if [ -x %{_bindir}/fc-cache ]; then
+      %{_bindir}/fc-cache -f %{fontdir}
+   fi
 fi
 
 
 %files
 %defattr(0644,root,root,0755)
 %doc *.txt *.pdf
-
 %config(noreplace) %{fontconfdir}60-%{fontname}.conf
 
 %dir %{fontdir}
@@ -79,6 +82,12 @@
 
 
 %changelog
+* Thu Nov 1 2007 <nicolas.mailhot at laposte.net>
+☺ 4.100-4
+✓ Sync with guidelines
+✓ new fontconfig aliasing syntax
+
+
 * Tue Aug 28 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 ☺ 4.100-3
 ✓ Sync with dejavu spec