rpms/yanone-kaffeesatz-fonts/devel import.log, NONE, 1.1 yanone-kaffeesatz-fonts-fontconfig.conf, 1.1, 1.2 yanone-kaffeesatz-fonts.spec, 1.1, 1.2

[Nicolas Mailhot (nim)]

Author: nim

Update of /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11854/devel

Modified Files:
	yanone-kaffeesatz-fonts-fontconfig.conf 
	yanone-kaffeesatz-fonts.spec 
Added Files:
	import.log 
Log Message:
⌖ Fedora 10 alpha general package cleanup


--- NEW FILE import.log ---
yanone-kaffeesatz-fonts-20061120-3_fc10:HEAD:yanone-kaffeesatz-fonts-20061120-3.fc10.src.rpm:1215809853


Index: yanone-kaffeesatz-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel/yanone-kaffeesatz-fonts-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yanone-kaffeesatz-fonts-fontconfig.conf	10 Jan 2008 21:54:30 -0000	1.1
+++ yanone-kaffeesatz-fonts-fontconfig.conf	11 Jul 2008 20:57:44 -0000	1.2
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<!-- /etc/fonts/conf.d/61-yanone-kaffeesatz.conf
-
-     Define aliasing and other fontconfig settings for
-     Yanone Kaffeesatz fonts
-
-     © 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
--->
 <fontconfig>
   <alias>
     <family>Yanone Kaffeesatz</family>
     <default>
-      <family>sans-serif</family>
+      <family>fantasy</family>
     </default>
   </alias>
+  <alias>
+    <family>fantasy</family>
+    <prefer>
+      <family>Yanone Kaffeesatz</family>
+    </prefer>
+  </alias>
 </fontconfig>


Index: yanone-kaffeesatz-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/yanone-kaffeesatz-fonts/devel/yanone-kaffeesatz-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yanone-kaffeesatz-fonts.spec	10 Jan 2008 21:54:30 -0000	1.1
+++ yanone-kaffeesatz-fonts.spec	11 Jul 2008 20:57:44 -0000	1.2
@@ -40,7 +40,7 @@
 install -m 0644 -p *.otf %{buildroot}%{fontdir}
 
 install -m 0755 -d %{buildroot}%{fontconfdir}
-install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/61-%{fontname}.conf
+install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/60-%{fontname}.conf
 
 
 %clean
@@ -48,16 +48,14 @@
 
 
 %post
-if [ -x %{_bindir}/fc-cache ]; then
-  %{_bindir}/fc-cache %{fontdir} || :
+if [ -x %{_bindir}/fc-cache ] ; then
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %postun
-if [ "$1" = "0" ]; then
-  if [ -x %{_bindir}/fc-cache ]; then
+if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
     %{_bindir}/fc-cache %{fontdir} || :
-  fi
 fi
 
 
@@ -65,13 +63,17 @@
 %defattr(0644,root,root,0755)
 %doc *.pdf
 
-%config(noreplace) %{fontconfdir}/61-%{fontname}.conf
+%config(noreplace) %{fontconfdir}/60-%{fontname}.conf
 
 %dir %{fontdir}
 %{fontdir}/*.otf
 
 
-%changelog 
+%changelog
+* Fri Jul 11 2008 <nicolas.mailhot at laposte.net>
+- 20061120-4
+⌖ Fedora 10 alpha general package cleanup
+
 * Sun Nov 25 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 ☺ 20061120-3
 ✓ initial packaging