From 011c8725ba1a01ed77e64adf1ab0becc0473d987 Mon Sep 17 00:00:00 2001
From: nim <nim@fedoraproject.org>
Date: Fri, 11 Jul 2008 20:56:41 +0000
Subject: [PATCH] =?UTF-8?q?=E2=8C=96=20Fedora=2010=20alpha=20general=20pac?=
 =?UTF-8?q?kage=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 import.log                           |  1 +
 stix-fonts-fontconfig.conf           |  7 ----
 stix-fonts-integrals-fontconfig.conf |  7 ----
 stix-fonts-pua-fontconfig.conf       |  7 ----
 stix-fonts-sizes-fontconfig.conf     |  7 ----
 stix-fonts-variants-fontconfig.conf  |  7 ----
 stix-fonts.spec                      | 62 +++++++++++++---------------
 7 files changed, 29 insertions(+), 69 deletions(-)
 create mode 100644 import.log

diff --git a/import.log b/import.log
new file mode 100644
index 0000000..2c20a43
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+stix-fonts-0_9-7_fc10:HEAD:stix-fonts-0.9-7.fc10.src.rpm:1215809789
diff --git a/stix-fonts-fontconfig.conf b/stix-fonts-fontconfig.conf
index d0ebe87..8c48db0 100644
--- a/stix-fonts-fontconfig.conf
+++ b/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>
diff --git a/stix-fonts-integrals-fontconfig.conf b/stix-fonts-integrals-fontconfig.conf
index 70b2d6f..43c5937 100644
--- a/stix-fonts-integrals-fontconfig.conf
+++ b/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>
diff --git a/stix-fonts-pua-fontconfig.conf b/stix-fonts-pua-fontconfig.conf
index de13a54..bce2e7d 100644
--- a/stix-fonts-pua-fontconfig.conf
+++ b/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>
diff --git a/stix-fonts-sizes-fontconfig.conf b/stix-fonts-sizes-fontconfig.conf
index f9c08f6..1d9a3ae 100644
--- a/stix-fonts-sizes-fontconfig.conf
+++ b/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>
diff --git a/stix-fonts-variants-fontconfig.conf b/stix-fonts-variants-fontconfig.conf
index dc5e01f..e71ca6b 100644
--- a/stix-fonts-variants-fontconfig.conf
+++ b/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>
diff --git a/stix-fonts.spec b/stix-fonts.spec
index e66344f..a68922b 100644
--- a/stix-fonts.spec
+++ b/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
@@ -137,72 +137,61 @@ rm -fr %{buildroot}
 
 
 %post
-if [ -x %{_bindir}/fc-cache ]; then
-   %{_bindir}/fc-cache -f %{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 -f %{fontdir}
-   fi
+if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %post pua
-if [ -x %{_bindir}/fc-cache ]; then
-   %{_bindir}/fc-cache -f %{fontdir}
+if [ -x %{_bindir}/fc-cache ] ; then
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %postun pua
-if [ "$1" = "0" ]; then
-   if [ -x %{_bindir}/fc-cache ]; then
-      %{_bindir}/fc-cache -f %{fontdir}
-   fi
+if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %post integrals
-if [ -x %{_bindir}/fc-cache ]; then
-   %{_bindir}/fc-cache -f %{fontdir}
+if [ -x %{_bindir}/fc-cache ] ; then
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %postun integrals
-if [ "$1" = "0" ]; then
-   if [ -x %{_bindir}/fc-cache ]; then
-      %{_bindir}/fc-cache -f %{fontdir}
-   fi
+if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %post sizes
-if [ -x %{_bindir}/fc-cache ]; then
-   %{_bindir}/fc-cache -f %{fontdir}
+if [ -x %{_bindir}/fc-cache ] ; then
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %postun sizes
-if [ "$1" = "0" ]; then
-   if [ -x %{_bindir}/fc-cache ]; then
-      %{_bindir}/fc-cache -f %{fontdir}
-   fi
+if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
-
 %post variants
-if [ -x %{_bindir}/fc-cache ]; then
-   %{_bindir}/fc-cache -f %{fontdir}
+if [ -x %{_bindir}/fc-cache ] ; then
+    %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 
 %postun variants
-if [ "$1" = "0" ]; then
-   if [ -x %{_bindir}/fc-cache ]; then
-      %{_bindir}/fc-cache -f %{fontdir}
-   fi
+if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
+    %{_bindir}/fc-cache %{fontdir} || :
 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