rpms/charis-fonts/devel charis-fonts-fontconfig.conf, 1.3, 1.4 charis-fonts.spec, 1.10, 1.11 import.log, 1.1, 1.2

[Nicolas Mailhot]

Author: nim

Update of /cvs/extras/rpms/charis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12316/devel

Modified Files:
	charis-fonts-fontconfig.conf charis-fonts.spec import.log 
Log Message:
update for new fonts guidelines


Index: charis-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/charis-fonts/devel/charis-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- charis-fonts-fontconfig.conf	11 Jul 2008 19:55:56 -0000	1.3
+++ charis-fonts-fontconfig.conf	17 Dec 2008 19:16:37 -0000	1.4
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <fontconfig>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>Charis SIL</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Charis SIL</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
   <alias binding="same">
     <family>Bitstream Charter</family>
     <accept>
@@ -13,16 +25,4 @@
       <family>Charis SIL</family>
     </accept>
   </alias>
-  <alias>
-    <family>Charis SIL</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>Charis SIL</family>
-    </prefer>
-  </alias>
 </fontconfig>


Index: charis-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/charis-fonts/devel/charis-fonts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- charis-fonts.spec	11 Jul 2008 19:55:56 -0000	1.10
+++ charis-fonts.spec	17 Dec 2008 19:16:37 -0000	1.11
@@ -1,24 +1,25 @@
-%define fontname    charis
-%define fontdir     %{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define fontname charis
+%define fontconf 60-%{fontname}.conf
 
 %define archivename CharisSIL
 
 Name:    %{fontname}-fonts
 Version: 4.104
-Release: 2%{?dist}
+Release: 4%{?dist}
 Summary: Charis SIL fonts
 
-Group:   User Interface/X
-License: OFL
-URL:     http://scripts.sil.org/CharisSILFont
+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}%{version}.zip
-Source0: %{archivename}%{version}.zip
-Source1: %{name}-fontconfig.conf
-
+Source0:   %{archivename}%{version}.zip
+Source1:   %{name}-fontconfig.conf
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch: noarch
+
+BuildArch:     noarch
+BuildRequires: fontpackages-devel
+Requires:      fontpackages-filesystem
 
 %description
 Charis SIL provides glyphs for a wide range of Latin and Cyrillic characters.
@@ -41,46 +42,42 @@
 
 
 %build
-# Nothing there
 
 
 %install
 rm -fr %{buildroot}
 
-install -m 0755 -d %{buildroot}%{fontdir}
-install -m 0644 -p *.ttf %{buildroot}%{fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
+
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
-install -m 0755 -d %{buildroot}%{fontconfdir}
-install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/60-%{fontname}.conf
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
 
 %clean
 rm -fr %{buildroot}
 
 
-%post
-if [ -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache %{fontdir} || :
-fi
-
-
-%postun
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache %{fontdir} || :
-fi
+%_font_pkg -f %{fontconf} *.ttf
 
-
-%files
-%defattr(0644,root,root,0755)
 %doc *.txt *.pdf
-
-%config(noreplace) %{fontconfdir}/60-%{fontname}.conf
-
-%dir %{fontdir}/
-%{fontdir}/*.ttf
+%dir %{_fontdir}
 
 
 %changelog
+* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
+- 4.104-4
+ᛤ ‘rpm-fonts’ renamed to “fontpackages”
+
+* Fri Nov 14 2008 <nicolas.mailhot at laposte.net>
+- 4.104-3
+▤ Rebuild using new « rpm-fonts »
+
 * Fri Jul 11 2008 <nicolas.mailhot at laposte.net>
 - 4.104-2
 ⌖ Fedora 10 alpha general package cleanup


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/charis-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Jul 2008 19:55:56 -0000	1.1
+++ import.log	17 Dec 2008 19:16:37 -0000	1.2
@@ -1 +1,2 @@
 charis-fonts-4_104-2_fc10:HEAD:charis-fonts-4.104-2.fc10.src.rpm:1215806033
+charis-fonts-4_104-4_fc11:HEAD:charis-fonts-4.104-4.fc11.src.rpm:1229541374