rpms/mathml-fonts/FC-3 find_symbol_font.sh, NONE, 1.1 mathml-fonts.spec, 1.2, 1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20759/FC-3

Modified Files:
	mathml-fonts.spec 
Added Files:
	find_symbol_font.sh 
Log Message:
sync branches w/-devel



***** Error reading new file: [Errno 2] No such file or directory: 'find_symbol_font.sh'

Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/FC-3/mathml-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mathml-fonts.spec	10 Dec 2004 22:03:07 -0000	1.2
+++ mathml-fonts.spec	3 Aug 2005 20:10:57 -0000	1.3
@@ -4,63 +4,60 @@
 %define fontdir       %{_datadir}/fonts/mathml
 
 Summary: Mathematical symbol fonts
-Name:	 mathml-fonts 
-Epoch:	 0
+Name:    mathml-fonts
 Version: 1.0
-Release: 14
-URL:	 http://www.mozilla.org/projects/mathml/fonts/
+Release: 16
+
+URL:     http://www.mozilla.org/projects/mathml/fonts/
 License: Distributable
 Group:   User Interface/X
 BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## Sources
+Source1: find_symbol_font.sh
+# Install as:
+%define find_symbol_dir  %{_libexecdir}/%{name}
+%define find_symbol_font %{find_symbol_dir}/find_symbol_font.sh
+
 ## Mathematica fonts
 Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe
 ## TeX fonts
 #Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf.tar.gz
 Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/cmbx10.ttf
-# Reference: http://wiki.lyx.org/beta/pmwiki.php/LyX/Troubleshooting
-Source21: http://www.movement.uklinux.net/latex-xft-fonts-0.1.tar.gz
+# Reference: http://wiki.lyx.org/LyX/Troubleshooting 
+Source21: http://movementarian.org/latex-xft-fonts-0.1.tar.gz 
 ## Design Science fonts
 #  License: http://www.dessci.com/en/support/eula/mtextralic.htm
 #  URL: http://www.dessci.com/en/dl/fonts/
-# extracted from MTW_Truetype.exe 
+# extracted from MTW_Truetype.exe
 # (couldn't figure out how extract at build-time -- Rex)
 Source30: mtextra.ttf
 
-BuildRequires: %{x11bindir}/mkfontdir, %{x11bindir}/mkfontscale
-# Help out apt/mach find the above
-BuildRequires: XFree86-font-utils
 BuildRequires: unzip
 
 # we're pretty much useless without it, and use fc-cache
-# in scriptlets
+# in %%post,%%postun,%%triggers 
 Prereq: fontconfig
 
-# Not *strictly* required, for Adobe (PS)  Symbol font, expects 
-# /usr/lib/acroread/Resource/Fonts
-# Prereq: acroread
-# BuildRequires: acroread
-
 Provides: latex-xft-fonts = 0:0.1
 
 %description
 This package contains fonts required to display mathematical
-symbols.  Applications supported include: 
+symbols.  Applications supported include:
 * mozilla (and netscape >= 7) to display MathML
 * lyx
 * kformula (koffice)
 
 
 %prep
-%setup -T -c -n %{name} 
+%setup -T -c -n %{name}
 
 ## Math'ca
 unzip %{SOURCE10}
 
 ## TeX fonts
-#setup -T -D -n %{name} -a 20 
+#setup -T -D -n %{name} -a 20
 cp -a %{SOURCE20} .
 %setup -T -D -n %{name} -a 21
 
@@ -84,40 +81,39 @@
   cmbx10.ttf mtextra.ttf \
   $RPM_BUILD_ROOT%{fontdir}/
 
-# Generate fonts.scale, etc... 
-# don't really *need* this step, as we're Xft only...
-%{x11bindir}/mkfontscale $RPM_BUILD_ROOT%{fontdir}
-%{x11bindir}/mkfontdir   $RPM_BUILD_ROOT%{fontdir}
+# find_symbol_font
+install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{find_symbol_font}
 
 # "touch" all fonts.dir, fonts.scale, etc files we've got flagged as %ghost
-touch $RPM_BUILD_ROOT%{fontdir}/{fonts.{dir,scale,cache-1},encodings.dir,Symbol.pfa}
+touch $RPM_BUILD_ROOT%{fontdir}/{fonts.cache-1,Symbol.pfa,SY______.PFB}
 
 
-%triggerin -- acroread
-if [ ! -e %{fontdir}/Symbol.pfa -a \
-       -e %{_libdir}/acroread/Resource/Font/Symbol ] ; then
-  ln -s %{_libdir}/acroread/Resource/Font/Symbol %{fontdir}/Symbol.pfa
-  ## Rebuild fontcache for now available Symbol.pfa
+%triggerin -- acroread,AdobeReader_enu
+%{find_symbol_font} ||:
+
+%triggerun -- acroread,AdobeReader_enu
+if [ $2 -eq 0 ]; then
   fc-cache -f %{fontdir} ||:
 fi
- 
-%triggerun -- acroread
-[ $2 -eq 0 ] && rm -f %{fontdir}/Symbol.pfa
-## Rebuild fontcache for now missing (or possibly changed) Symbol.pfa
-fc-cache -f %{fontdir} ||:
 
 %post
+%{find_symbol_font} ||:
 fc-cache -f %{fontdir} ||:
 
+%postun
+if [ $1 -eq 0 ]; then
+  fc-cache ||:
+fi
+
 
 %files
 %defattr(-,root,root)
+%dir %{find_symbol_dir}
+%{find_symbol_font}
 %dir %{fontdir}
 %{fontdir}/*.[ot]tf
-%{fontdir}/fonts.dir
-%{fontdir}/fonts.scale
-%{fontdir}/encodings.dir
 %ghost %{fontdir}/Symbol.pfa
+%ghost %{fontdir}/SY______.PFB
 %ghost %{fontdir}/fonts.cache-1
 
 
@@ -126,6 +122,16 @@
 
 
 %changelog
+* Wed Aug  3 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-16
+- update for acroread7 (and SY_____.PFB) (bug #133709)
+- include/use find_symbol_font.sh helper script
+- readd %%postun
+- update latex-xft-fonts URL
+- remove legacy crud
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Mon Apr 26 2004 Rex Dieter <rexdieter at sf.net> 0:1.0-0.fdr.14
 - remove touch-y Symbol.pfa stuff. (-:
 - rework acroread triggers
@@ -144,7 +150,7 @@
 - add comment regarding lyx fonts
 - remove use of mkfontdir -e which causes build failure on FC2.
 - remove deprecated Xft1 bits
-- add %%trigger for acroread, to rebuild font.cache-1 when/if 
+- add %%trigger for acroread, to rebuild font.cache-1 when/if
   Symbol.pfa becomes available/unavailable.
 
 * Tue Jan 13 2004 Rex Dieter <rexdieter at sf.net> 0:1.0-0.fdr.10
@@ -187,6 +193,6 @@
 * Mon Nov 11 2002 Rex Dieter <rdieter at unl.edu> 1.0-0
 - include latest Mathematica 4.1 fonts + CMSY10,CMEX10
 - Require type1inst with added/fixed ams/wri font foundries
-- prefer Math*.pfa over Math*.pfb as type1inst seems to 
+- prefer Math*.pfa over Math*.pfb as type1inst seems to
   incorrectly identify some of the pfb versions.