OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Oct-2006 19:28:06
Branch: HEAD Handle: 2006101518280600
Modified files:
openpkg-src/tetex tetex.spec
Log:
version the XMLTex/PassiveTeX vendor ZIP files; take over cleanups
from Michael Schloh; style cleanups
Summary:
Revision Changes Path
1.72 +22 -20 openpkg-src/tetex/tetex.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tetex/tetex.spec
============================================================================
$ cvs diff -u -r1.71 -r1.72 tetex.spec
--- openpkg-src/tetex/tetex.spec 13 Oct 2006 17:34:48 -0000 1.71
+++ openpkg-src/tetex/tetex.spec 15 Oct 2006 17:28:06 -0000 1.72
@@ -23,9 +23,11 @@
##
# package versions
-%define V_base 3.0
-%define V_src 3.0
-%define V_texmf 3.0
+%define V_base 3.0
+%define V_src 3.0
+%define V_texmf 3.0
+%define V_xmltex 20020625
+%define V_passivetex 20031022
# package information
Name: tetex
@@ -38,7 +40,7 @@
Group: Typesetting
License: GPL
Version: %{V_src}
-Release: 20061013
+Release: 20061015
# package options
%option with_x11 no
@@ -46,15 +48,17 @@
# list of sources
Source0:
ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/%{V_base}/distrib/tetex-src-%{V_src}.tar.gz
Source1:
ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/%{V_base}/distrib/tetex-texmf-%{V_texmf}.tar.gz
-Source2: http://www.tei-c.org.uk/Software/passivetex/passivetex.zip
-Source3: ftp://tug.ctan.org/tex-archive/macros/xmltex/base.zip
+Source2:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/tetex/passivetex-%{V_passivetex}.zip
+Source3:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/tetex/base-%{V_xmltex}.zip
Patch0: tetex.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, infozip, flex, bison,
png, zlib
-PreReq: OpenPKG, openpkg >= 20040130, perl, png, zlib
+BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, infozip, flex, bison
+PreReq: OpenPKG, openpkg >= 20040130, perl
+BuildPreReq: png, zlib
+PreReq: png, zlib
%if "%{with_x11}" == "yes"
BuildPreReq: X11, xaw3d
PreReq: X11, xaw3d
@@ -69,7 +73,7 @@
most popular TeX macro set (LaTeX) for TeX was invented by Leslie
Lamport. The OpenPKG teTeX package also contains David Carlisle'
xmltex (namespace-aware XML parser written in TeX) and Sebastian
- Rahtz' PassiveTeX (XML-FO rendering engine).
+ Rahtz' PassiveTeX (XSL-FO rendering engine).
%track
prog tetex:tetex-src = {
@@ -101,13 +105,13 @@
# add XMLTeX (XML parsing via TeX)
( cd $RPM_BUILD_ROOT%{l_prefix}/share/texmf/tex
- %{l_prefix}/bin/unzip -x %{SOURCE base.zip}
+ %{l_prefix}/bin/unzip -x %{SOURCE base-%{V_xmltex}.zip}
mv base xmltex
) || exit $?
( echo ""
echo "# XMLTeX (XML parsing via TeX) [does not work as expected here]"
- echo "# xmltex latex language.dat xmltex.ini"
- echo "# pdfxmltex pdflatex language.dat pdfxmltex.ini"
+ echo "xmltex latex language.dat xmltex.ini"
+ echo "pdfxmltex pdflatex language.dat pdfxmltex.ini"
echo ""
) >>texk/web2c/fmtutil.in
( echo ""
@@ -137,11 +141,11 @@
echo ""
) >>texk/kpathsea/texmf.in
- # add PassiveTeX (XML-FO to DVI/PDF translation via TeX)
+ # add PassiveTeX (XSL-FO to DVI/PDF translation via TeX)
( %{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/share/texmf/tex/latex/passivetex
cd $RPM_BUILD_ROOT%{l_prefix}/share/texmf/tex/latex/passivetex
- %{l_prefix}/bin/unzip -x %{SOURCE passivetex.zip}
+ %{l_prefix}/bin/unzip -x %{SOURCE passivetex-%{V_passivetex}.zip}
rm -f ChangeLog Makefile README.passivetex send
rm -rf test
) || exit $?
@@ -152,6 +156,10 @@
%{l_shtool} subst \
-e '1s;/usr/bin/perl;/usr/bin/env perl;' \
texk/*/t1mapper
+ %{l_shtool} subst \
+ -e "s;\(\$(scriptdir)/fmtutil-sys --all\);\1 --fmtdir
$RPM_BUILD_ROOT%{l_prefix}/share/texmf/web2c;" \
+ -e "s,\(\$(scriptdir)/updmap-sys\);,\1 --dvipsoutputdir
$RPM_BUILD_ROOT%{l_prefix}/share/texmf/fonts/map/dvips/updmap --pdftexoutputdir
$RPM_BUILD_ROOT%{l_prefix}/share/texmf/fonts/map/dvips/updmap
--dvipdfmoutputdir
$RPM_BUILD_ROOT%{l_prefix}/share/texmf/fonts/map/dvips/updmap;," \
+ Makefile.in
%build
# configure the system by using the (wrong) paths to the temporary
@@ -216,12 +224,6 @@
# "eval" around the call is just to shut-up speclint)
eval "make install"
- # perform manual steps for installing XMLTeX
- ( cd $RPM_BUILD_ROOT%{l_prefix}/bin
- ln -s tex xmltex
- ln -s pdftex pdfxmltex
- ) || exit $?
-
# create dynamically generated font directory
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/var/tetex
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
