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

[Nicolas Mailhot (nim)]

Author: nim

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

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


--- NEW FILE import.log ---
charis-fonts-4_104-2_fc10:HEAD:charis-fonts-4.104-2.fc10.src.rpm:1215806033


Index: charis-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/charis-fonts/devel/charis-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- charis-fonts-fontconfig.conf	1 Nov 2007 18:23:05 -0000	1.2
+++ charis-fonts-fontconfig.conf	11 Jul 2008 19:55:56 -0000	1.3
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!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>
-  <!-- Font substitution rules -->
   <alias binding="same">
     <family>Bitstream Charter</family>
     <accept>
@@ -20,14 +13,12 @@
       <family>Charis SIL</family>
     </accept>
   </alias>
-  <!-- Generic name aliasing -->
   <alias>
     <family>Charis SIL</family>
     <default>
       <family>serif</family>
     </default>
   </alias>
-  <!-- Alias generic names -->
   <alias>
     <family>serif</family>
     <prefer>


Index: charis-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/charis-fonts/devel/charis-fonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- charis-fonts.spec	18 May 2008 15:11:13 -0000	1.9
+++ charis-fonts.spec	11 Jul 2008 19:55:56 -0000	1.10
@@ -6,7 +6,7 @@
 
 Name:    %{fontname}-fonts
 Version: 4.104
-Release: 1%{?alphatag}%{?dist}
+Release: 2%{?dist}
 Summary: Charis SIL fonts
 
 Group:   User Interface/X
@@ -25,7 +25,7 @@
 Charis is similar to Bitstream Charter, one of the first fonts designed
 specifically for laser printers. It is highly readable and holds up well in
 less-than-ideal reproduction environments. It also has a full set of styles
-- regular, italic, bold, bold italic - and so is more useful in general
+— regular, italic, bold, bold italic — and so is more useful in general
 publishing than Doulos SIL. Charis is a serif proportionally spaced font
 optimized for readability in long printed documents.
 
@@ -41,7 +41,7 @@
 
 
 %build
-# Source format not available
+# Nothing there
 
 
 %install
@@ -59,29 +59,32 @@
 
 
 %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
-      %{_bindir}/fc-cache %{fontdir}
-   fi
+if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %files
 %defattr(0644,root,root,0755)
 %doc *.txt *.pdf
+
 %config(noreplace) %{fontconfdir}/60-%{fontname}.conf
 
-%dir %{fontdir}
+%dir %{fontdir}/
 %{fontdir}/*.ttf
 
 
 %changelog
+* Fri Jul 11 2008 <nicolas.mailhot at laposte.net>
+- 4.104-2
+⌖ Fedora 10 alpha general package cleanup
+
 * Sun May 18 2008 <nicolas.mailhot at laposte.net>
 - 4.104-1
 ⧉ New Unicode 5.1 compliant release, with some glyphs moved out of PUA