rpms/mathml-fonts/devel .cvsignore, 1.2, 1.3 find_symbol_font.sh, 1.2, 1.3 mathml-fonts.spec, 1.8, 1.9 sources, 1.2, 1.3

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore find_symbol_font.sh mathml-fonts.spec sources 
Log Message:
* Thu Sep 15 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-18
- replace latex-xft-fonts with bakoma4lyx
- remove non-distributable Math'ca fonts (#168405)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:51:17 -0000	1.2
+++ .cvsignore	15 Sep 2005 19:37:56 -0000	1.3
@@ -1,3 +1,3 @@
 cmbx10.ttf
-latex-xft-fonts-0.1.tar.gz
+BaKoMa4LyX.zip
 mtextra.ttf


Index: find_symbol_font.sh
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/find_symbol_font.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- find_symbol_font.sh	5 Aug 2005 16:06:29 -0000	1.2
+++ find_symbol_font.sh	15 Sep 2005 19:37:56 -0000	1.3
@@ -1,6 +1,10 @@
 #!/bin/bash
 # $Id$
 
+if [ -f /etc/sysconfig/mathml-fonts ]; then
+ source /etc/sysconfig/mathml-fonts
+fi
+
 fontdir=${MATHML_FONTS_DIR:-/usr/share/fonts/mathml}
 
 while true


Index: mathml-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/mathml-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mathml-fonts.spec	5 Aug 2005 16:42:46 -0000	1.8
+++ mathml-fonts.spec	15 Sep 2005 19:37:56 -0000	1.9
@@ -5,8 +5,8 @@
 
 Summary: Mathematical symbol fonts
 Name:    mathml-fonts
-Version: 1.0
-Release: 17%{?dist}
+Version: 1.0 
+Release: 18%{?dist}
 
 URL:     http://www.mozilla.org/projects/mathml/fonts/
 License: Distributable
@@ -21,16 +21,17 @@
 %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
+#  License: http://support.wolfram.com/mathematica/systems/windows/general/latestfonts.html (non-distributable)
+%{?_with_mathematica: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/LyX/Troubleshooting 
-Source21: http://movementarian.org/latex-xft-fonts-0.1.tar.gz 
+Source21: ftp://ftp.lyx.org/pub/lyx/contrib/BaKoMa4LyX.zip
 ## Design Science fonts
-#  License: http://www.dessci.com/en/support/eula/mtextralic.htm
+#  License: http://www.dessci.com/en/support/eula/fonts/mtextralic.htm
 #  URL: http://www.dessci.com/en/dl/fonts/
-# extracted from MTW_Truetype.exe
+# extracted from MathTypeTrueTypeFonts.exe (rename from http://www.dessci.com/en/dl/MathTypeTrueTypeFonts.asp)
 # (couldn't figure out how extract at build-time -- Rex)
 Source30: mtextra.ttf
 
@@ -40,11 +41,14 @@
 # in %%post,%%postun,%%triggers 
 Prereq: fontconfig
 
-Provides: latex-xft-fonts = 0:0.1
+# Provide lyx upstream contrib rpms
+Provides: latex-xft-fonts = 0.1
+Provides: latex-bakoma4lyx-fonts = 1
 
 %description
 This package contains fonts required to display mathematical
 symbols.  Applications supported include:
+
 * mozilla (and netscape >= 7) to display MathML
 * lyx
 * kformula (koffice)
@@ -54,11 +58,12 @@
 %setup -T -c -n %{name}
 
 ## Math'ca
-unzip %{SOURCE10}
+%{?_with_mathematica:unzip %{SOURCE10}}
 
 ## TeX fonts
 #setup -T -D -n %{name} -a 20
 cp -a %{SOURCE20} .
+
 %setup -T -D -n %{name} -a 21
 
 ## dessci
@@ -74,11 +79,9 @@
 
 install -d $RPM_BUILD_ROOT%{fontdir}
 
-# Ignore warnings about duplicate files/fonts, they're indentical anyway.
 install -p -m644 \
-  math{1,2,4}___.ttf \
-  latex-xft-fonts*/*.ttf \
-  cmbx10.ttf mtextra.ttf \
+  %{?_with_mathematica:math{1,2,4}___.ttf} \
+  *10.ttf mtextra.ttf \
   $RPM_BUILD_ROOT%{fontdir}/
 
 # find_symbol_font
@@ -108,6 +111,7 @@
 
 %files
 %defattr(-,root,root)
+%doc Readme.txt
 %dir %{find_symbol_dir}
 %{find_symbol_font}
 %dir %{fontdir}
@@ -122,8 +126,12 @@
 
 
 %changelog
+* Thu Sep 15 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-18
+- replace latex-xft-fonts with bakoma4lyx
+- remove non-distributable Math'ca fonts (#168405)
+
 * Wed Aug  3 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-17
-- update for acroread7 (and SY_____.PFB) (bug #133709)
+- update for acroread7 (and SY_____.PFB) (#133709)
 - include/use find_symbol_font.sh helper script
 - readd %%postun
 - update latex-xft-fonts URL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mathml-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:51:17 -0000	1.2
+++ sources	15 Sep 2005 19:37:56 -0000	1.3
@@ -1,3 +1,3 @@
 19f80def73f72679e916fa8143f9be02  cmbx10.ttf
-0f3275e403be5fdbd14117dd8a26675f  latex-xft-fonts-0.1.tar.gz
+46d1caf4e2bf294d641cf1c37be19082  BaKoMa4LyX.zip
 fe5c714162bf1b9c936b2bc5e66da03e  mtextra.ttf