rpms/stix-fonts/devel import.log, 1.1, 1.2 stix-fonts-fontconfig.conf, 1.3, 1.4 stix-fonts.spec, 1.4, 1.5

Nicolas Mailhot nim at fedoraproject.org
Wed Dec 17 19:59:23 UTC 2008 

Author: nim

Update of /cvs/extras/rpms/stix-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1205/devel

Modified Files:
	import.log stix-fonts-fontconfig.conf stix-fonts.spec 
Log Message:
update for new fonts guidelines


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Jul 2008 20:56:41 -0000	1.1
+++ import.log	17 Dec 2008 19:58:52 -0000	1.2
@@ -1 +1,2 @@
 stix-fonts-0_9-7_fc10:HEAD:stix-fonts-0.9-7.fc10.src.rpm:1215809789
+stix-fonts-0_9-9_fc11:HEAD:stix-fonts-0.9-9.fc11.src.rpm:1229543904


Index: stix-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- stix-fonts-fontconfig.conf	11 Jul 2008 20:56:41 -0000	1.3
+++ stix-fonts-fontconfig.conf	17 Dec 2008 19:58:52 -0000	1.4
@@ -2,15 +2,15 @@
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <fontconfig>
   <alias>
-    <family>STIXGeneral</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-  <alias>
     <family>serif</family>
     <prefer>
       <family>STIXGeneral</family>
     </prefer>
   </alias>
+  <alias>
+    <family>STIXGeneral</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
 </fontconfig>


Index: stix-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- stix-fonts.spec	11 Jul 2008 20:56:41 -0000	1.4
+++ stix-fonts.spec	17 Dec 2008 19:58:52 -0000	1.5
@@ -1,50 +1,49 @@
-%define fontname    stix
-%define fontdir     %{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define fontname stix
+%define fontconf 61-%{fontname}
 
 %define archivename STIXBeta
 
+%define common_desc \
+The mission of the Scientific and Technical Information Exchange (STIX) font \
+creation project is the preparation of a comprehensive set of fonts that serve \
+the scientific and engineering community in the process from manuscript \
+creation through final publication, both in electronic and print formats.
+
 Name:    %{fontname}-fonts
 Version: 0.9
-Release: 7%{?dist}
+Release: 9%{?dist}
 Summary: STIX scientific and engineering fonts
 
-Group:   User Interface/X
-License: STIX
-URL:     http://www.stixfonts.org/
-Source0: %{archivename}.zip
-Source1: %{name}-License.txt
-Source2: stix-fonts-fontconfig.conf
-Source3: stix-fonts-pua-fontconfig.conf
-Source4: stix-fonts-integrals-fontconfig.conf
-Source5: stix-fonts-sizes-fontconfig.conf
-Source6: stix-fonts-variants-fontconfig.conf
-
+Group:     User Interface/X
+License:   STIX
+URL:       http://www.stixfonts.org/
+Source0:   %{archivename}.zip
+Source1:   %{name}-License.txt
+Source2:   stix-fonts-fontconfig.conf
+Source3:   stix-fonts-pua-fontconfig.conf
+Source4:   stix-fonts-integrals-fontconfig.conf
+Source5:   stix-fonts-sizes-fontconfig.conf
+Source6:   stix-fonts-variants-fontconfig.conf
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch: noarch
+
+BuildArch:     noarch
+BuildRequires: fontpackages-devel
+Requires:      fontpackages-filesystem
 
 %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
-the scientific and engineering community in the process from manuscript
-creation through final publication, both in electronic and print formats.
+%common_desc
 
 This package includes base Unicode fonts containing most glyphs for standard
 use.
 
 
-%package pua
-Group:    User Interface/X
+%package  pua
 Summary:  STIX scientific and engineering fonts, PUA glyphs
-# Does not really make sense without the core typefaces
+Group:    User Interface/X
 Requires: %{name} = %{version}-%{release}
 
-
 %description pua
-The mission of the Scientific and Technical Information Exchange (STIX) font
-creation project is the preparation of a comprehensive set of fonts that serve
-the scientific and engineering community in the process from manuscript
-creation through final publication, both in electronic and print formats.
+%common_desc
 
 This package includes fonts containing glyphs called out from the Unicode
 Private Use Area (PUA) range. Glyphs in this range do not have an official
@@ -52,56 +51,49 @@
 software. Text using them will break if they're ever accepted by the Unicode
 Consortium and moved to an official codepoint.
 
+%_font_pkg -n pua -f %{fontconf}-pua.conf STIXNonUni*otf
 
-%package integrals
-Group:    User Interface/X
+
+%package  integrals
 Summary:  STIX scientific and engineering fonts, additional integral glyphs
-# Does not really make sense without the core typefaces
+Group:    User Interface/X
 Requires: %{name} = %{version}-%{release}
 
-
 %description integrals
-The mission of the Scientific and Technical Information Exchange (STIX) font
-creation project is the preparation of a comprehensive set of fonts that serve
-the scientific and engineering community in the process from manuscript
-creation through final publication, both in electronic and print formats.
+%common_desc
 
 This package includes fonts containing additional integrals of various size
 and slant.
 
+%_font_pkg -n integrals -f %{fontconf}-integrals.conf STIXInt*.otf
 
-%package sizes
-Group:    User Interface/X
+
+%package  sizes
 Summary:  STIX scientific and engineering fonts, additional glyph sizes
-# Does not really make sense without the core typefaces
+Group:    User Interface/X
 Requires: %{name} = %{version}-%{release}
 
-
 %description sizes
-The mission of the Scientific and Technical Information Exchange (STIX) font
-creation project is the preparation of a comprehensive set of fonts that serve
-the scientific and engineering community in the process from manuscript
-creation through final publication, both in electronic and print formats.
+%common_desc
 
 This package includes fonts containing glyphs in additional sizes (Mostly
 "fence" and "piece" glyphs).
 
+%_font_pkg -n sizes -f %{fontconf}-sizes.conf STIXSiz*.otf
 
-%package variants
-Group:    User Interface/X
+
+%package  variants
 Summary:  STIX scientific and engineering fonts, additional glyph variants
-# Does not really make sense without the core typefaces
+Group:    User Interface/X
 Requires: %{name} = %{version}-%{release}
 
-
 %description variants
-The mission of the Scientific and Technical Information Exchange (STIX) font
-creation project is the preparation of a comprehensive set of fonts that serve
-the scientific and engineering community in the process from manuscript
-creation through final publication, both in electronic and print formats.
+%common_desc
 
 This package includes fonts containing alternative variants of some glyphs.
 
+%_font_pkg -n variants -f %{fontconf}-variants.conf STIXVar*otf
+
 
 %prep
 %setup -c -q -n %{archivename}
@@ -115,120 +107,57 @@
 
 
 %build
-# Nothing there
 
 
 %install
 rm -fr %{buildroot}
 
-install -m 0755 -d %{buildroot}%{fontdir}
-install -m 0644 -p *.otf %{buildroot}%{fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.otf %{buildroot}%{_fontdir}
 
-install -m 0755 -d %{buildroot}%{fontconfdir}
-install -m 0644 -p %{SOURCE2} %{buildroot}%{fontconfdir}/61-%{fontname}.conf
-install -m 0644 -p %{SOURCE3} %{buildroot}%{fontconfdir}/61-%{fontname}-pua.conf
-install -m 0644 -p %{SOURCE4} %{buildroot}%{fontconfdir}/61-%{fontname}-integrals.conf
-install -m 0644 -p %{SOURCE5} %{buildroot}%{fontconfdir}/61-%{fontname}-sizes.conf
-install -m 0644 -p %{SOURCE6} %{buildroot}%{fontconfdir}/61-%{fontname}-variants.conf
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
+
+install -m 0644 -p %{SOURCE2} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
+install -m 0644 -p %{SOURCE3} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-pua.conf
+install -m 0644 -p %{SOURCE4} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-integrals.conf
+install -m 0644 -p %{SOURCE5} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sizes.conf
+install -m 0644 -p %{SOURCE6} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-variants.conf
+
+for fontconf in %{fontconf}.conf \
+                %{fontconf}-pua.conf \
+                %{fontconf}-integrals.conf \
+                %{fontconf}-sizes.conf \
+                %{fontconf}-variants.conf ; do
+  ln -s %{_fontconfig_templatedir}/$fontconf \
+        %{buildroot}%{_fontconfig_confdir}/$fontconf
+done
 
 
 %clean
 rm -fr %{buildroot}
 
 
-%post
-if [ -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache %{fontdir} || :
-fi
-
+%_font_pkg -f %{fontconf}.conf STIXGeneral*otf
 
-%postun
-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 %{fontdir} || :
-fi
-
-
-%postun pua
-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 %{fontdir} || :
-fi
-
-
-%postun integrals
-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 %{fontdir} || :
-fi
-
-
-%postun sizes
-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 %{fontdir} || :
-fi
-
-
-%postun variants
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache %{fontdir} || :
-fi
-
-
-%files
-%defattr(0644,root,root,0755)
 %doc *.txt
-%config(noreplace) %{fontconfdir}/61-%{fontname}.conf
-
-%dir %{fontdir}/
-%{fontdir}/STIXGeneral*otf
-
-
-%files pua
-%defattr(0644,root,root,0755)
-%config(noreplace) %{fontconfdir}/61-%{fontname}-pua.conf
-%{fontdir}/STIXNonUni*otf
-
-
-%files integrals
-%defattr(0644,root,root,0755)
-%config(noreplace) %{fontconfdir}/61-%{fontname}-integrals.conf
-%{fontdir}/STIXInt*.otf
-
-
-%files sizes
-%defattr(0644,root,root,0755)
-%config(noreplace) %{fontconfdir}/61-%{fontname}-sizes.conf
-%{fontdir}/STIXSiz*.otf
-
-
-%files variants
-%defattr(0644,root,root,0755)
-%config(noreplace) %{fontconfdir}/61-%{fontname}-variants.conf
-%{fontdir}/STIXVar*otf
+%dir %{_fontdir}
 
 
 %changelog
+* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
+- 0.9-9
+ᛤ ‘rpm-fonts’ renamed to “fontpackages”
+
+* Fri Nov 14 2008 <nicolas.mailhot at laposte.net>
+- 0.9-8
+▤ Rebuild using new « rpm-fonts »
+
 * Fri Jul 11 2008 <nicolas.mailhot at laposte.net>
 - 0.9-7
 ⌖ Fedora 10 alpha general package cleanup

More information about the fedora-extras-commits mailing list