rpms/mathml-fonts/devel mathml-fonts.spec,1.4,1.5

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/mathml-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14182

Modified Files:
	mathml-fonts.spec 
Log Message:
- 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



Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/mathml-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mathml-fonts.spec	6 Apr 2005 22:12:24 -0000	1.4
+++ mathml-fonts.spec	3 Aug 2005 17:06:31 -0000	1.5
@@ -6,7 +6,7 @@
 Summary: Mathematical symbol fonts
 Name:    mathml-fonts
 Version: 1.0
-Release: 15
+Release: 16
 
 URL:     http://www.mozilla.org/projects/mathml/fonts/
 License: Distributable
@@ -15,13 +15,17 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 ## Sources
+Source1: find_symbol_font.sh
+# Install as:
+%define find_symbol_font %{_libexecdir}/%{name}/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/
@@ -29,20 +33,12 @@
 # (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
@@ -84,40 +80,38 @@
   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)
+%{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 +120,13 @@
 
 
 %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