rpms/jadetex/devel jadetex.spec,1.19,1.20

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/jadetex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31517

Modified Files:
	jadetex.spec 
Log Message:
removed TeXdir macro, replaced by other rpm macros


Index: jadetex.spec
===================================================================
RCS file: /cvs/extras/rpms/jadetex/devel/jadetex.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jadetex.spec	4 Jan 2008 15:16:11 -0000	1.19
+++ jadetex.spec	7 Jan 2008 09:23:11 -0000	1.20
@@ -1,5 +1,3 @@
-%define TeXdir %(cd `kpsewhich -expand-var '$TEXMFMAIN'`/../..; pwd)
-
 Name: jadetex
 Version: 3.13
 Release: 2%{?dist}
@@ -11,7 +9,7 @@
 URL: http://sourceforge.net/projects/jadetex
 
 Requires: sgml-common >= 0.5
-Requires: tetex >= 3.0 tetex-latex >= 3.0 tetex-fonts >= 3.0
+Requires: tetex >= 3.0 tetex-latex >= 3.0
 Requires: jade
 Requires(post): tetex >= 3.0
 BuildRequires: unzip tetex-latex tetex tetex-fonts
@@ -46,14 +44,14 @@
 mkdir -p $DESTDIR
 make install DESTDIR=$DESTDIR
 
-mkdir -p ${DESTDIR}%{TeXdir}/share/texmf/tex/jadetex
-cp -p *.ini ${DESTDIR}%{TeXdir}/share/texmf/tex/jadetex
-cp -p *.sty ${DESTDIR}%{TeXdir}/share/texmf/tex/jadetex
-cp -p *.cnf ${DESTDIR}%{TeXdir}/share/texmf/tex/jadetex
-
-mkdir -p ${DESTDIR}%{TeXdir}/bin
-ln -s etex ${DESTDIR}%{TeXdir}/bin/jadetex
-ln -s pdfetex ${DESTDIR}%{TeXdir}/bin/pdfjadetex
+mkdir -p ${DESTDIR}%{_datadir}/texmf/tex/jadetex
+cp -p *.ini ${DESTDIR}%{_datadir}/texmf/tex/jadetex
+cp -p *.sty ${DESTDIR}%{_datadir}/texmf/tex/jadetex
+cp -p *.cnf ${DESTDIR}%{_datadir}/texmf/tex/jadetex
+
+mkdir -p ${DESTDIR}%{_bindir}
+ln -s etex ${DESTDIR}%{_bindir}/jadetex
+ln -s pdfetex ${DESTDIR}%{_bindir}/pdfjadetex
 
 
 %clean
@@ -63,7 +61,7 @@
 
 %post
 [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
-/usr/bin/env - PATH=$PATH:%{TeXdir}/bin fmtutil-sys --cnffile %{TeXdir}/share/texmf/tex/jadetex/jadefmtutil.cnf --all --fmtdir %{TeXdir}/share/texmf/web2c > /dev/null 2>&1
+%{_bindir}/env - PATH=$PATH:%{_bindir} fmtutil-sys --cnffile %{_datadir}/texmf/tex/jadetex/jadefmtutil.cnf --all --fmtdir %{_datadir}/texmf/web2c > /dev/null 2>&1
 exit 0
 
 %postun
@@ -73,28 +71,30 @@
 %files
 %defattr(-,root,root,-)
 %doc index.html
-%ghost %{TeXdir}/share/texmf/web2c/jadetex.fmt
-%ghost %{TeXdir}/share/texmf/web2c/pdfjadetex.fmt
-%dir %{TeXdir}/share/texmf/tex/jadetex
-%{TeXdir}/share/texmf/tex/jadetex/dsssl.def
-%{TeXdir}/share/texmf/tex/jadetex/jadetex.ltx
-%{TeXdir}/share/texmf/tex/jadetex/jadetex.ini
-%{TeXdir}/share/texmf/tex/jadetex/pdfjadetex.ini
-%{TeXdir}/share/texmf/tex/jadetex/dummyels.sty
-%{TeXdir}/share/texmf/tex/jadetex/mlnames.sty
-%{TeXdir}/share/texmf/tex/jadetex/ucharacters.sty
-%{TeXdir}/share/texmf/tex/jadetex/uentities.sty
-%{TeXdir}/share/texmf/tex/jadetex/unicode.sty
-%{TeXdir}/share/texmf/tex/jadetex/jadefmtutil.cnf
-%{TeXdir}/bin/jadetex
-%{TeXdir}/bin/pdfjadetex
+%ghost %{_datadir}/texmf/web2c/jadetex.fmt
+%ghost %{_datadir}/texmf/web2c/pdfjadetex.fmt
+%dir %{_datadir}/texmf/tex/jadetex
+%{_datadir}/texmf/tex/jadetex/dsssl.def
+%{_datadir}/texmf/tex/jadetex/jadetex.ltx
+%{_datadir}/texmf/tex/jadetex/jadetex.ini
+%{_datadir}/texmf/tex/jadetex/pdfjadetex.ini
+%{_datadir}/texmf/tex/jadetex/dummyels.sty
+%{_datadir}/texmf/tex/jadetex/mlnames.sty
+%{_datadir}/texmf/tex/jadetex/ucharacters.sty
+%{_datadir}/texmf/tex/jadetex/uentities.sty
+%{_datadir}/texmf/tex/jadetex/unicode.sty
+%{_datadir}/texmf/tex/jadetex/jadefmtutil.cnf
+%{_bindir}/jadetex
+%{_bindir}/pdfjadetex
 
 %triggerin -- tetex-latex
-/usr/bin/env - PATH=$PATH:%{TeXdir}/bin fmtutil-sys --cnffile %{TeXdir}/share/texmf/tex/jadetex/jadefmtutil.cnf --all > /dev/null 2>&1
+/usr/bin/env - PATH=$PATH:%{_bindir} fmtutil-sys --cnffile %{_datadir}/texmf/tex/jadetex/jadefmtutil.cnf --all > /dev/null 2>&1
 exit 0
 
 %changelog
-* Fri Jan  4 2008 Ondrej Vasik  <ovasik at redhat.com> 3.13-2
+* Mon Jan  7 2008 Ondrej Vasik  <ovasik at redhat.com> 3.13-2
+- removed TeXdir macro, replaced by /usr(in fact by other
+  rpm macros)
 - used texcongig-sys rehash instead of texhash
 - added documentation html file
 - dist tag, license fix