rpms/tetex-font-tipa/FC-4 tetex-font-tipa.spec,1.4,1.5

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/tetex-font-tipa/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6821

Modified Files:
	tetex-font-tipa.spec 
Log Message:
* Thu Sep 22 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3-3
- Run udpmap-sys in scriptlets, not udpmap.
- Update location of map files.
- Own all relevant directories.



Index: tetex-font-tipa.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-font-tipa/FC-4/tetex-font-tipa.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tetex-font-tipa.spec	6 Apr 2005 22:13:33 -0000	1.4
+++ tetex-font-tipa.spec	22 Sep 2005 11:04:25 -0000	1.5
@@ -1,11 +1,15 @@
+# This package is for Fedora Core >= 4.
+
 %define texmf      %{_datadir}/texmf
 %define tdsname    tipa
+
 %define fontpath   fkr/tipa
+# The directory prefix of fontpath we want to own.
+%define fontpathtop  fkr
 
 Name:           tetex-font-tipa
 Version:        1.3
-Release:        2
-
+Release:        3
 Summary:        TIPA fonts for LaTeX
 
 Group:          Applications/Publishing
@@ -14,13 +18,12 @@
 # NOTE: This tarball cannot be verified directly as it is
 # automatically generated by the FTP site. Instead, the
 # files contained in the tarball have to be verified one by one ;(
-Source0:        ftp://ftp.dante.de/tex-archive/fonts/tipa/tipa-1.3.tar.gz
+Source0:        ftp://ftp.dante.de/tex-archive/fonts/tipa/tipa-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tetex-latex
 Requires:       tetex-latex
 Requires(post): tetex
-Requires(preun): tetex
 Requires(postun): tetex
 BuildArch:      noarch
 
@@ -51,8 +54,8 @@
 install -p -m 644 tfm/*.tfm $RPM_BUILD_ROOT%{texmf}/fonts/tfm/%{fontpath}/
 install -p -m 644 mf/*.mf $RPM_BUILD_ROOT%{texmf}/fonts/source/%{fontpath}/
 
-mkdir -p $RPM_BUILD_ROOT%{texmf}/dvips/config
-install -m 644 dvips/*.map $RPM_BUILD_ROOT%{texmf}/dvips/config/
+mkdir -p $RPM_BUILD_ROOT%{texmf}/fonts/map/dvips/%{tdsname}
+install -m 644 dvips/*.map $RPM_BUILD_ROOT%{texmf}/fonts/map/dvips/%{tdsname}/
 
 
 %clean
@@ -61,14 +64,17 @@
 
 %post
 /usr/bin/mktexlsr %{texmf}
-/usr/bin/updmap --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map tipa.map
-
-%preun
-if [ "$1" = "0" ]; then
-  /usr/bin/updmap --quiet --nohash --outputdir %{texmf}/dvips/config --disable tipa.map
+if [ "$1" = "2" ]; then
+    [ -f /usr/share/texmf/dvips/config/tipa.map ] && \
+      rm -f /usr/share/texmf/dvips/config/tipa.map
 fi
+/usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map tipa.map
+
 
 %postun
+if [ "$1" = "0" ]; then
+  /usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --disable tipa.map
+fi
 /usr/bin/mktexlsr %{texmf}
 
 
@@ -76,14 +82,19 @@
 %defattr(-,root,root,-)
 %doc doc/tipaman.dvi
 %{texmf}/tex/latex/%{tdsname}
-%{texmf}/fonts/tfm/%{fontpath}
-%{texmf}/fonts/type1/%{fontpath}
-%{texmf}/fonts/source/%{fontpath}
-%{texmf}/dvips/config/tipa.map
+%{texmf}/fonts/tfm/%{fontpathtop}
+%{texmf}/fonts/type1/%{fontpathtop}
+%{texmf}/fonts/source/%{fontpathtop}
+%{texmf}/fonts/map/dvips/%{tdsname}/
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Sep 22 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3-3
+- Run udpmap-sys in scriptlets, not udpmap.
+- Update location of map files.
+- Own all relevant directories.
+
+* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3-2
 - rebuilt
 
 * Thu Apr 22 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:1.3-0.fdr.1