rpms/tetex-arabtex/FC-4 tetex-arabtex.spec,1.5,1.6

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/tetex-arabtex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11656

Modified Files:
	tetex-arabtex.spec 
Log Message:
* Sat Nov 12 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 3.11-3.l
- Update location of map files (#172783).
- Remove obsolete --outputdir within scriptlets.
- Run updmap-sys in scriptlets only during installation/removal.



Index: tetex-arabtex.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-arabtex/FC-4/tetex-arabtex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tetex-arabtex.spec	6 Apr 2005 22:13:32 -0000	1.5
+++ tetex-arabtex.spec	12 Nov 2005 20:24:30 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           tetex-arabtex
 Version:        3.11
-Release:        2.l
+Release:        3.l%{?dist}
 
 Summary:        ArabTeX package for TeX/LaTeX
 
@@ -51,8 +51,8 @@
 install -p -m 644 tfm/* $RPM_BUILD_ROOT%{texmf}/fonts/tfm/%{fontpath}/
 install -p -m 644 psfonts/*.pfb $RPM_BUILD_ROOT%{texmf}/fonts/type1/%{fontpath}/
 
-mkdir -p $RPM_BUILD_ROOT%{texmf}/dvips/config
-install -p -m 644 psfonts/*.map $RPM_BUILD_ROOT%{texmf}/dvips/config/
+mkdir -p $RPM_BUILD_ROOT%{texmf}/fonts/map/dvips/%{tdsname}
+install -p -m 644 psfonts/*.map $RPM_BUILD_ROOT%{texmf}/fonts/map/dvips/%{tdsname}/
 
 
 %clean
@@ -60,12 +60,19 @@
 
 
 %post
+if [ "$1" = "2" ]; then
+    [ -f /usr/share/texmf/dvips/config/arabtex.map ] && \
+      rm -f /usr/share/texmf/dvips/config/arabtex.map
+fi
 /usr/bin/mktexlsr %{texmf}
-/usr/bin/updmap --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map arabtex.map
+if [ "$1" = "1" ]; then
+    /usr/bin/updmap-sys --quiet --nohash --enable Map arabtex.map
+fi
+
 
 %postun
 if [ "$1" = "0" ]; then
-  /usr/bin/updmap --quiet --nohash --outputdir %{texmf}/dvips/config --disable arabtex.map
+  /usr/bin/updmap-sys --quiet --nohash --disable arabtex.map
 fi
 /usr/bin/mktexlsr %{texmf}
 
@@ -78,10 +85,15 @@
 %{texmf}/fonts/source/%{fontpath}
 %{texmf}/fonts/tfm/%{fontpath}
 %{texmf}/fonts/type1/%{fontpath}
-%{texmf}/dvips/config
+%{texmf}/fonts/map/dvips/%{tdsname}/
 
 
 %changelog
+* Sat Nov 12 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 3.11-3.l
+- Update location of map files (#172783).
+- Remove obsolete --outputdir within scriptlets.
+- Run updmap-sys in scriptlets only during installation/removal.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt