rpms/yanone-kaffeesatz-fonts/devel import.log, 1.2, 1.3 yanone-kaffeesatz-fonts-fontconfig.conf, 1.2, 1.3 yanone-kaffeesatz-fonts.spec, 1.3, 1.4

[Nicolas Mailhot]

Author: nim

Update of /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2300/devel

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	1 Sep 2008 13:04:49 -0000	1.2
+++ import.log	17 Dec 2008 20:00:45 -0000	1.3
@@ -1,2 +1,3 @@
 yanone-kaffeesatz-fonts-20061120-3_fc10:HEAD:yanone-kaffeesatz-fonts-20061120-3.fc10.src.rpm:1215809853
 yanone-kaffeesatz-fonts-20080723-1_fc10:HEAD:yanone-kaffeesatz-fonts-20080723-1.fc10.src.rpm:1220274279
+yanone-kaffeesatz-fonts-20080723-3_fc11:HEAD:yanone-kaffeesatz-fonts-20080723-3.fc11.src.rpm:1229544015


Index: yanone-kaffeesatz-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel/yanone-kaffeesatz-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yanone-kaffeesatz-fonts-fontconfig.conf	11 Jul 2008 20:57:44 -0000	1.2
+++ yanone-kaffeesatz-fonts-fontconfig.conf	17 Dec 2008 20:00:45 -0000	1.3
@@ -2,15 +2,15 @@
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <fontconfig>
   <alias>
-    <family>Yanone Kaffeesatz</family>
-    <default>
-      <family>fantasy</family>
-    </default>
-  </alias>
-  <alias>
     <family>fantasy</family>
     <prefer>
       <family>Yanone Kaffeesatz</family>
     </prefer>
   </alias>
+  <alias>
+    <family>Yanone Kaffeesatz</family>
+    <default>
+      <family>fantasy</family>
+    </default>
+  </alias>
 </fontconfig>


Index: yanone-kaffeesatz-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel/yanone-kaffeesatz-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yanone-kaffeesatz-fonts.spec	1 Sep 2008 13:04:49 -0000	1.3
+++ yanone-kaffeesatz-fonts.spec	17 Dec 2008 20:00:45 -0000	1.4
@@ -1,23 +1,24 @@
-%define fontname    yanone-kaffeesatz
-%define fontdir     %{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define fontname yanone-kaffeesatz
+%define fontconf 60-%{fontname}.conf
 
 %define archivename YanoneKaffeesatz
 
 Name:    %{fontname}-fonts
 Version: 20080723
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: Yanone Kaffeesatz decorative fonts
 
-Group:   User Interface/X
-License: CC-BY
-URL:     http://www.yanone.de/typedesign/kaffeesatz/
-Source0: %{url}%{archivename}.zip
-Source1: %{name}-fontconfig.conf
-Source2: %{url}%{archivename}.pdf
-
+Group:     User Interface/X
+License:   CC-BY
+URL:       http://www.yanone.de/typedesign/kaffeesatz/
+Source0:   %{url}%{archivename}.zip
+Source1:   %{name}-fontconfig.conf
+Source2:   %{url}%{archivename}.pdf
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch: noarch
+
+BuildArch:     noarch
+BuildRequires: fontpackages-devel
+Requires:      fontpackages-filesystem
 
 %description
 Sans-serif decorative latin OTF font by Jan Gerner, suitable for titles and
@@ -30,46 +31,42 @@
 
 
 %build
-# Nothing there
 
 
 %install
 rm -fr %{buildroot}
 
-install -m 0755 -d %{buildroot}%{fontdir}
-install -m 0644 -p *.otf %{buildroot}%{fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.otf %{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} *.otf
 
-
-%files
-%defattr(0644,root,root,0755)
 %doc *.pdf
-
-%config(noreplace) %{fontconfdir}/60-%{fontname}.conf
-
-%dir %{fontdir}
-%{fontdir}/*.otf
+%dir %{_fontdir}
 
 
 %changelog
+* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
+- 20080723-3
+ᛤ ‘rpm-fonts’ renamed to “fontpackages”
+
+* Fri Nov 14 2008 <nicolas.mailhot at laposte.net>
+- 20080723-2
+â–¤ Rebuild using new rpm-font
+
 * Mon Sep 1 2008 <nicolas.mailhot at laposte.net>
 - 20080723-1
 ☕ Upstream stealth update