rpms/charis-fonts/devel charis-fonts-fontconfig.conf, NONE, 1.1 .cvsignore, 1.2, 1.3 charis-fonts.spec, 1.3, 1.4 sources, 1.2, 1.3

[Nicolas Mailhot (nim)]

Author: nim

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

Modified Files:
	.cvsignore charis-fonts.spec sources 
Added Files:
	charis-fonts-fontconfig.conf 
Log Message:
4.100, spec reorg


--- NEW FILE charis-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- /etc/fonts/conf.d/60-charis.conf

     Define settings for Charis SIL fonts

     © 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 -->
  <alias>
    <family>Charis SIL</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
  <!-- Alias generic names -->
  <alias>
    <family>serif</family>
    <prefer>
      <family>Charis SIL</family>
    </prefer>
  </alias>
</fontconfig>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/charis-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Feb 2006 14:46:54 -0000	1.2
+++ .cvsignore	31 May 2007 18:20:12 -0000	1.3
@@ -1 +1 @@
-CharisSIL4.0.02.r1.zip
+CharisSIL4.100.zip


Index: charis-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/charis-fonts/devel/charis-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- charis-fonts.spec	9 Nov 2006 16:37:57 -0000	1.3
+++ charis-fonts.spec	31 May 2007 18:20:12 -0000	1.4
@@ -1,17 +1,24 @@
-%define fontdir         %{_datadir}/fonts/charis
+%define fontname        charis
+%define fontdir         %{_datadir}/fonts/%{fontname}
+%define fontconfdir     %{_sysconfdir}/fonts
+
+%define archivename     CharisSIL%{version}
+
+Name:      %{fontname}-fonts
+Version:   4.100
+Release:   1%{?alphatag}%{?dist}
+Summary:   Charis SIL fonts
+
+Group:     User Interface/X
+License:   SIL Open Font License
+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
 
-Name:           charis-fonts
-Version:        4.0.02
-Release:        3%{?dist}
-Summary:        Charis SIL fonts
-
-Group:          User Interface/X
-License:        SIL Open Font License
-URL:            http://scripts.sil.org/CharisSILFont
-# Source0 can be downloaded from http://scripts.sil.org/CharisSIL_download#FontsDownload
-Source0:        CharisSIL%{version}.r1.zip
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 %description
 Charis SIL provides glyphs for a wide range of Latin and Cyrillic characters.
@@ -25,46 +32,58 @@
 
 %prep
 %setup -q -c
-%{__sed} -i 's/\r//' *.txt
+sed -i 's/\r//' *.txt
 
 
 %build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -fr %{buildroot}
 
-install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
-install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}
+# Fonts
+install -m 0755 -d %{buildroot}%{fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{fontdir}
+
+# Fontconfig tweaks
+install -m 0755 -d %{buildroot}%{fontconfdir}/conf.d
+install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/60-%{fontname}.conf
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -fr %{buildroot}
 
 
 %post
-if [ -x %{_bindir}/fc-cache ]; then
-  %{_bindir}/fc-cache %{_datadir}/fonts
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache /usr/share/fonts
 fi
 
 
 %postun
 if [ "$1" = "0" ]; then
-  if [ -x %{_bindir}/fc-cache ]; then
-    %{_bindir}/fc-cache %{_datadir}/fonts
+  if [ -x /usr/bin/fc-cache ]; then
+    /usr/bin/fc-cache /usr/share/fonts
   fi
 fi
 
 
 %files
 %defattr(0644,root,root,0755)
-%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt CharisSIL4FontDocumentation.pdf
+%doc *.txt *.pdf
+
+%config(noreplace) %{fontconfdir}/conf.d/60-%{fontname}.conf
 
 %dir %{fontdir}
 %{fontdir}/*.ttf
 
 
 %changelog
+* Thu May 31 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+☺ 4.100-1
+✓ add fontconfig setup file
+✓ make spec closer to the dejavu one to simplify maintenance
+
 * Thu Nov 09 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 4.0.02-3
 - Remove ghost-ed fontconfig cache files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/charis-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Feb 2006 14:46:54 -0000	1.2
+++ sources	31 May 2007 18:20:12 -0000	1.3
@@ -1 +1 @@
-73b5b2c262d75326a661faca5823abfe  CharisSIL4.0.02.r1.zip
+b4fe96ce17acc58744027acd4298d198  CharisSIL4.100.zip