⌖ Fedora 10 alpha general package cleanup

import.log

@@ -0,0 +1 @@
+stix-fonts-0_9-7_fc10:HEAD:stix-fonts-0.9-7.fc10.src.rpm:1215809789

stix-fonts-fontconfig.conf

@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<!-- /etc/fonts/conf.d/61-stix.conf
-
-     Define aliasing and other fontconfig settings for
-     STIX base fonts
-
-     © 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
--->
 <fontconfig>
   <alias>
     <family>STIXGeneral</family>

stix-fonts-integrals-fontconfig.conf

@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<!-- /etc/fonts/conf.d/61-stix-integrals.conf
-
-     Define aliasing and other fontconfig settings for
-     STIX PUA fonts
-
-     © 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
--->
 <fontconfig>
   <alias binding="same">
     <family>STIXIntegrals</family>

stix-fonts-pua-fontconfig.conf

@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<!-- /etc/fonts/conf.d/61-stix-pua.conf
-
-     Define aliasing and other fontconfig settings for
-     STIX PUA fonts
-
-     © 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
--->
 <fontconfig>
   <alias binding="same">
     <family>STIXNonUnicode</family>

stix-fonts-sizes-fontconfig.conf

@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<!-- /etc/fonts/conf.d/61-stix-sizes.conf
-
-     Define aliasing and other fontconfig settings for
-     STIX size fonts
-
-     © 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
--->
 <fontconfig>
   <alias binding="same">
     <family>STIXSize1</family>

stix-fonts-variants-fontconfig.conf

@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<!-- /etc/fonts/conf.d/61-stix-variants.conf
-
-     Define aliasing and other fontconfig settings for
-     STIX variants fonts
-
-     © 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
--->
 <fontconfig>
   <alias binding="same">
     <family>STIXVariants</family>

stix-fonts.spec

@@ -6,7 +6,7 @@
 
 Name:    %{fontname}-fonts
 Version: 0.9
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: STIX scientific and engineering fonts
 
 Group:   User Interface/X
@@ -115,7 +115,7 @@ done
 
 
 %build
-# Source format not available
+# Nothing there
 
 
 %install
@@ -138,71 +138,60 @@ rm -fr %{buildroot}
 
 %post
 if [ -x %{_bindir}/fc-cache ] ; then
-   %{_bindir}/fc-cache -f %{fontdir}
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %postun
-if [ "$1" = "0" ]; then
+if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-   if [ -x %{_bindir}/fc-cache ]; then
+    %{_bindir}/fc-cache %{fontdir} || :
-      %{_bindir}/fc-cache -f %{fontdir}
-   fi
 fi
 
 
 %post pua
 if [ -x %{_bindir}/fc-cache ] ; then
-   %{_bindir}/fc-cache -f %{fontdir}
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %postun pua
-if [ "$1" = "0" ]; then
+if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-   if [ -x %{_bindir}/fc-cache ]; then
+    %{_bindir}/fc-cache %{fontdir} || :
-      %{_bindir}/fc-cache -f %{fontdir}
-   fi
 fi
 
 
 %post integrals
 if [ -x %{_bindir}/fc-cache ] ; then
-   %{_bindir}/fc-cache -f %{fontdir}
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %postun integrals
-if [ "$1" = "0" ]; then
+if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-   if [ -x %{_bindir}/fc-cache ]; then
+    %{_bindir}/fc-cache %{fontdir} || :
-      %{_bindir}/fc-cache -f %{fontdir}
-   fi
 fi
 
 
 %post sizes
 if [ -x %{_bindir}/fc-cache ] ; then
-   %{_bindir}/fc-cache -f %{fontdir}
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %postun sizes
-if [ "$1" = "0" ]; then
+if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-   if [ -x %{_bindir}/fc-cache ]; then
+    %{_bindir}/fc-cache %{fontdir} || :
-      %{_bindir}/fc-cache -f %{fontdir}
 fi
-fi
-
 
 %post variants
 if [ -x %{_bindir}/fc-cache ] ; then
-   %{_bindir}/fc-cache -f %{fontdir}
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %postun variants
-if [ "$1" = "0" ]; then
+if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-   if [ -x %{_bindir}/fc-cache ]; then
+    %{_bindir}/fc-cache %{fontdir} || :
-      %{_bindir}/fc-cache -f %{fontdir}
-   fi
 fi
 
 
@@ -211,7 +200,7 @@ fi
 %doc *.txt
 %config(noreplace) %{fontconfdir}/61-%{fontname}.conf
 
-%dir %{fontdir}
+%dir %{fontdir}/
 %{fontdir}/STIXGeneral*otf
 
 
@@ -240,6 +229,11 @@ fi
 
 
 %changelog
+* Fri Jul 11 2008 <nicolas.mailhot at laposte.net>
+- 0.9-7
+⌖ Fedora 10 alpha general package cleanup
+
+
 * Thu Nov 1 2007 <nicolas.mailhot at laposte.net>
 ☺ 0.9-6
  ✓ Add some fontconfig aliasing rules