rpms/andika-fonts/devel andika-fonts-fontconfig.conf, 1.1, 1.2 andika-fonts.spec, 1.1, 1.2 import.log, 1.1, 1.2

[Nicolas Mailhot]

Author: nim

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

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


Index: andika-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/andika-fonts/devel/andika-fonts-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- andika-fonts-fontconfig.conf	13 Jul 2008 20:24:58 -0000	1.1
+++ andika-fonts-fontconfig.conf	17 Dec 2008 19:08:38 -0000	1.2
@@ -2,15 +2,15 @@
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <fontconfig>
   <alias>
-    <family>Andika</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-  <alias>
     <family>sans-serif</family>
     <prefer>
       <family>Andika</family>
     </prefer>
   </alias>
+  <alias>
+    <family>Andika</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
 </fontconfig>


Index: andika-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/andika-fonts/devel/andika-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- andika-fonts.spec	13 Jul 2008 20:24:58 -0000	1.1
+++ andika-fonts.spec	17 Dec 2008 19:08:38 -0000	1.2
@@ -1,25 +1,26 @@
-%define fontname    andika
-%define fontdir     %{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define fontname andika
+%define fontconf 60-%{fontname}.conf
 
 # Someday SIL will release sanely named archives
 %define archivename AndikaBasicR_10
 
 Name:    %{fontname}-fonts
 Version: 1.0
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: A font for literacy and beginning readers
 
-Group:   User Interface/X
-License: OFL
-URL:     http://scripts.sil.org/Andika
+Group:     User Interface/X
+License:   OFL
+URL:       http://scripts.sil.org/Andika
 # Actual download URL
 # http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=%{archivename}&filename=%{archivename}.zip
-Source0: %{archivename}.zip
-Source1: %{name}-fontconfig.conf
-
+Source0:   %{archivename}.zip
+Source1:   %{name}-fontconfig.conf
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch: noarch
+
+BuildArch:     noarch
+BuildRequires: fontpackages-devel
+Requires:      fontpackages-filesystem
 
 %description
 Andika is a sans serif, Unicode-compliant font designed especially for
@@ -53,45 +54,40 @@
 
 
 %build
-# Source format not available
 
 
 %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}%{fontconfdir}
-install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/60-%{fontname}.conf
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
+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
-%config(noreplace) %{fontconfdir}/60-%{fontname}.conf
-
-%dir %{fontdir}
-%{fontdir}/*.ttf
-
+%dir %{_fontdir}
 
 %changelog
+* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
+- 1.0-3
+ᛤ ‘rpm-fonts’ renamed to “fontpackages”
+
+* Fri Nov 14 2008 <nicolas.mailhot at laposte.net>
+- 1.0-2
+▤ Rebuild using new « rpm-fonts »
+
 * Tue Jun 24 2008 <nicolas.mailhot at laposte.net>
 - 1.0-1
 Ṑ Initial packaging


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/andika-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Jul 2008 20:24:58 -0000	1.1
+++ import.log	17 Dec 2008 19:08:38 -0000	1.2
@@ -1 +1,2 @@
 andika-fonts-1_0-1_fc10:HEAD:andika-fonts-1.0-1.fc10.src.rpm:1215980688
+andika-fonts-1_0-3_fc11:HEAD:andika-fonts-1.0-3.fc11.src.rpm:1229540895