rpms/stix-fonts/F-7 stix-fonts-fontconfig.conf, 1.2, 1.3 stix-fonts-integrals-fontconfig.conf, 1.2, 1.3 stix-fonts-pua-fontconfig.conf, 1.2, 1.3 stix-fonts-sizes-fontconfig.conf, 1.2, 1.3 stix-fonts-variants-fontconfig.conf, 1.2, 1.3 stix-fonts.spec, 1.3, 1.4

Nicolas Mailhot (nim) fedora-extras-commits at redhat.com
Sat Nov 3 18:49:38 UTC 2007


Author: nim

Update of /cvs/extras/rpms/stix-fonts/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31257/F-7

Modified Files:
	stix-fonts-fontconfig.conf 
	stix-fonts-integrals-fontconfig.conf 
	stix-fonts-pua-fontconfig.conf 
	stix-fonts-sizes-fontconfig.conf 
	stix-fonts-variants-fontconfig.conf stix-fonts.spec 
Log Message:
sync with F-8 package


Index: stix-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/F-7/stix-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stix-fonts-fontconfig.conf	1 Nov 2007 18:20:55 -0000	1.2
+++ stix-fonts-fontconfig.conf	3 Nov 2007 18:49:05 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <!-- /etc/fonts/conf.d/61-stix.conf
 


Index: stix-fonts-integrals-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/F-7/stix-fonts-integrals-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stix-fonts-integrals-fontconfig.conf	1 Nov 2007 18:20:55 -0000	1.2
+++ stix-fonts-integrals-fontconfig.conf	3 Nov 2007 18:49:05 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <!-- /etc/fonts/conf.d/61-stix-integrals.conf
 
@@ -8,10 +8,12 @@
      © 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 -->
 <fontconfig>
-  <alias binding="same">
-    <family>STIXIntegrals</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
+  <match>
+    <test name="family">
+      <string>STIXIntegrals</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>STIXGeneral</string>
+    </edit>
+  </match>
 </fontconfig>


Index: stix-fonts-pua-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/F-7/stix-fonts-pua-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stix-fonts-pua-fontconfig.conf	1 Nov 2007 18:20:55 -0000	1.2
+++ stix-fonts-pua-fontconfig.conf	3 Nov 2007 18:49:05 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <!-- /etc/fonts/conf.d/61-stix-pua.conf
 
@@ -8,10 +8,12 @@
      © 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 -->
 <fontconfig>
-  <alias binding="same">
-    <family>STIXNonUnicode</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
+  <match>
+    <test name="family">
+      <string>STIXNonUnicode</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>STIXGeneral</string>
+    </edit>
+  </match>
 </fontconfig>


Index: stix-fonts-sizes-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/F-7/stix-fonts-sizes-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stix-fonts-sizes-fontconfig.conf	1 Nov 2007 18:20:55 -0000	1.2
+++ stix-fonts-sizes-fontconfig.conf	3 Nov 2007 18:49:05 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <!-- /etc/fonts/conf.d/61-stix-sizes.conf
 
@@ -8,34 +8,44 @@
      © 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 -->
 <fontconfig>
-  <alias binding="same">
-    <family>STIXSize1</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>STIXSize2</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>STIXSize3</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>STIXSize4</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>STIXSize5</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
+  <match>
+    <test name="family">
+      <string>STIXSize1</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>STIXGeneral</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>STIXSize2</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>STIXGeneral</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>STIXSize3</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>STIXGeneral</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>STIXSize4</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>STIXGeneral</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>STIXSize5</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>STIXGeneral</string>
+    </edit>
+  </match>
 </fontconfig>


Index: stix-fonts-variants-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/F-7/stix-fonts-variants-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stix-fonts-variants-fontconfig.conf	1 Nov 2007 18:20:55 -0000	1.2
+++ stix-fonts-variants-fontconfig.conf	3 Nov 2007 18:49:05 -0000	1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <!-- /etc/fonts/conf.d/61-stix-variants.conf
 
@@ -8,10 +8,12 @@
      © 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 -->
 <fontconfig>
-  <alias binding="same">
-    <family>STIXVariants</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
+  <match>
+    <test name="family">
+      <string>STIXVariants</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>STIXGeneral</string>
+    </edit>
+  </match>
 </fontconfig>


Index: stix-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/F-7/stix-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- stix-fonts.spec	1 Nov 2007 18:20:55 -0000	1.3
+++ stix-fonts.spec	3 Nov 2007 18:49:05 -0000	1.4
@@ -1,12 +1,11 @@
-%define fontname    stix
-%define fontdir     %{_datadir}/fonts/%{fontname}
+%define fontname stix
+%define fontdir %{_datadir}/fonts/%{fontname}
 %define fontconfdir %{_sysconfdir}/fonts/conf.d
-
 %define archivename STIXBeta
 
 Name:    %{fontname}-fonts
 Version: 0.9
-Release: 6%{?dist}
+Release: 5%{?dist}
 Summary: STIX scientific and engineering fonts
 
 Group:   User Interface/X
@@ -20,9 +19,11 @@
 Source5: stix-fonts-sizes-fontconfig.conf
 Source6: stix-fonts-variants-fontconfig.conf
 
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 
+
 %description
 The mission of the Scientific and Technical Information Exchange (STIX) font
 creation project is the preparation of a comprehensive set of fonts that serve
@@ -241,7 +242,7 @@
 
 %changelog
 * Thu Nov 1 2007 <nicolas.mailhot at laposte.net>
-☺ 0.9-6
+☺ 0.9-5
  ✓ Add some fontconfig aliasing rules
 ☢ 0.9-4
 âš  Initial experimental packaging




More information about the fedora-extras-commits mailing list