rpms/tetex-tex4ht/devel .cvsignore, 1.14, 1.15 AlProTex.sty, 1.1, 1.2 sources, 1.15, 1.16 tetex-tex4ht.spec, 1.20, 1.21
Patrice Dumas
pertusus at fedoraproject.org
Sat Oct 4 22:22:36 UTC 2008
- Previous message: rpms/eel2/devel eel-2.24.0-fade.patch, NONE, 1.1 eel2.spec, 1.102, 1.103 eel-2.23.92-fade.patch, 1.3, NONE
- Next message: rpms/bluez-gnome/devel .cvsignore, 1.28, 1.29 bluetooth-sendto-ods-svn.patch, 1.1, 1.2 bluez-gnome.spec, 1.63, 1.64 sources, 1.28, 1.29 05_bluetooth_sendto_dbus-snd.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pertusus
Update of /cvs/extras/rpms/tetex-tex4ht/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28013
Modified Files:
.cvsignore AlProTex.sty sources tetex-tex4ht.spec
Log Message:
* Sat Oct 4 2008 Patrice Dumas <pertusus at free.fr> 1.0.2008_09_16_1413-1
- update to 2008_09_16_1413
- adapt to texlive
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 11 Apr 2008 22:58:51 -0000 1.14
+++ .cvsignore 4 Oct 2008 22:22:05 -0000 1.15
@@ -1,4 +1,4 @@
-tex4ht_20080228-1.diff.gz
-tex4ht-all-20070609.zip
-tex4ht-lit-20080229.zip
-tex4ht-1.0.2008_02_28_2058.tar.gz
+tex4ht-1.0.2008_09_16_1413.tar.gz
+tex4ht-all-20080616.zip
+tex4ht-lit-20080616.zip
+tex4ht_20080701-2.diff.gz
Index: AlProTex.sty
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/AlProTex.sty,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AlProTex.sty 3 Nov 2006 00:41:27 -0000 1.1
+++ AlProTex.sty 4 Oct 2008 22:22:05 -0000 1.2
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% AlProTex.sty 2004-06-18-18:54 %
-% Copyright (C) 1992--2004 by Eitan M. Gurari %
+% AlProTex.sty 2008-06-09-16:59 %
+% Copyright (C) 1992--2008 by Eitan M. Gurari %
% %
% This program can redistributed and/or modified under %
% the terms of the LaTeX Project Public License %
@@ -17,7 +17,7 @@
% gurari at cse.ohio-state.edu %
% http://www.cse.ohio-state.edu/~gurari %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2004-06-18-18:54}
+\immediate\write-1{version 2008-06-09-16:59}
\expandafter\edef\csname :RestoreCatcodes\endcsname{%
\catcode`\noexpand\noexpand\noexpand \^=\the\catcode`\^%
@@ -1036,7 +1036,7 @@
\expandafter\:temp \csname ifHtml\endcsname \Htmlfalse
\fi
-\def\EndLink{\ifx \empty:lnk\empty \HCode{</\tag:A>}\fi}
+\def\EndLink{\ifx \empty:lnk\empty \HCode{\Hbrakets</\tag:A>}\fi}
\def\:HRef{\ifx [\:temp \expandafter\::HRef
\else \expandafter\:::HRef \fi }
\def\HT:tag{\ifx -\let:val \expandafter\H:Tag
@@ -1207,7 +1207,7 @@
\def\e:protex{\HCode{<br />\html:invisible}}
\def\c:protex{\HCode{<i>}}
\def\d:protex{\HCode{</i>}}
-\def\f:protex{\def\:Sp{\HCode{\string }}}
+\def\f:protex{\def\:Sp{\HCode{\string&\#x00A0;}}}
\long\def\c:ShowCode:#1#2#3#4#5#6{\def\a:protex{#1}%
\def\b:protex{#2}\def\e:protex{#3}\def\c:protex{#4}%
\def\d:protex{#5}\def\f:protex{\def\:Sp{#6}}}
@@ -1291,7 +1291,7 @@
\def\clearcode::id{0} \def\clearcode:id{0}
\fi
\ifx \html:par\:UnDef \def\html:par{\HCode{<p>}} \fi
-\def\html:invisible{<!--x-->\string }
+\def\html:invisible{<!--x-->\string&\#x00A0;}
\expandafter\ifx\csname htmlprotex:par\endcsname\relax
\ifx\:removeindenttrue\:UnDef
\def\:removeindenttrue{\let\:Undef=\:Undef}
@@ -1323,8 +1323,9 @@
\let\ht:special=\special
\fi
\def\HCode#1{\ifx \EndPicture\:UnDef
- \ifvmode\leavevmode\fi\ht:special{t4ht=#1}\fi}
+ \relax\ifvmode\leavevmode\fi\ht:special{t4ht=#1}\fi}
\let\:HCode=\HCode
+\let\Hbrakets\empty
\def\NewLineChar{\bgroup \catcode`\^=7 \:NewLineChar}
\def\:NewLineChar#1{\egroup \def\:newlnch{ #1}}
\NewLineChar{^^J}
@@ -1334,24 +1335,24 @@
\def\get:atr#1 #2!*?: #3#4{\def\:attr{\space#2}%
\def\:te:mpa{#1}\ifx \:te:mpa\empty \let\:te:mpa#4\else
\def\:te:mpa{#3[#1]}\fi \:te:mpa}
-\def\H:Tag#1#2{\:TagHTag{#2}\HCode{<\tag:A\:newlnch
+\def\H:Tag#1#2{\:TagHTag{#2}\HCode{\Hbrakets<\tag:A\:newlnch
\NAME:"#2"\empty:lnk>}}
\def\::hRef[#1]#2{%
- \HCode{<\tag:A\:newlnch \if\relax#1#2\relax \NOHREF:{}\else
+ \HCode{\Hbrakets<\tag:A\:newlnch \if\relax#1#2\relax \NOHREF:{}\else
\HREF:"#1\if\relax#1\relax \else\:sharp #2\fi"\fi
\:attr \empty:lnk>}}
\def\:::HRef#1{%
- \HCode{<\tag:A\:newlnch \if\relax#1\relax \NOHREF:{}\else
+ \HCode{\Hbrakets<\tag:A\:newlnch \if\relax#1\relax \NOHREF:{}\else
\HREF:"\get:hfile{#1}\:sharp #1"\fi \:attr \empty:lnk>}}
\def\::hRefTag[#1]#2#3{%
\if\relax#3\relax\else\:TagHTag{#3}\fi
- \HCode{<\tag:A\:newlnch \if\relax#1#2\relax \NOHREF:{#3}\else
+ \HCode{\Hbrakets<\tag:A\:newlnch \if\relax#1#2\relax \NOHREF:{#3}\else
\HREF:"#1\if\relax#2\relax \else\:sharp #2\fi"\fi
\if\relax#3\relax\else\space \NAME:"#3"\fi
\:attr \empty:lnk>}}
\def\:::HRefTag#1#2{%
\if\relax#2\relax\else\:TagHTag{#2}\fi
- \HCode{<\tag:A\:newlnch \if\relax#1\relax \NOHREF:{#2}%
+ \HCode{\Hbrakets<\tag:A\:newlnch \if\relax#1\relax \NOHREF:{#2}%
\else\HREF:"\get:hfile{#1}\:sharp #1"\fi
\if\relax#2\relax\else\space \NAME:"#2"\fi
\:attr \empty:lnk>}}
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 11 Apr 2008 22:58:51 -0000 1.15
+++ sources 4 Oct 2008 22:22:05 -0000 1.16
@@ -1,4 +1,4 @@
-0c5f4a6f3dd275e90adfa0317ffbb898 tex4ht_20080228-1.diff.gz
-32fa3f44611fd86259aad939444b87d8 tex4ht-all-20070609.zip
-0b3c6273ec0e1d35cce9677324690f4e tex4ht-lit-20080229.zip
-dc9d78c8ad22acd4b40dfd2cbbe2b8de tex4ht-1.0.2008_02_28_2058.tar.gz
+1b5635aafc4af5f8fed17226fa3ee301 tex4ht-1.0.2008_09_16_1413.tar.gz
+c50534bcbfa9e17a547e4ac7b323ab7f tex4ht-all-20080616.zip
+afd1ab4aedfdd76d5c095e6735b26388 tex4ht-lit-20080616.zip
+224bbbad3a96bb1eaee306815270128f tex4ht_20080701-2.diff.gz
Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tetex-tex4ht.spec 13 Apr 2008 22:17:46 -0000 1.20
+++ tetex-tex4ht.spec 4 Oct 2008 22:22:05 -0000 1.21
@@ -4,27 +4,27 @@
Summary: Translates TeX and LaTeX into HTML or XML+MathML
Name: tetex-tex4ht
-Version: 1.0.2008_02_28_2058
-Release: 3%{?dist}
+Version: 1.0.2008_09_16_1413
+Release: 1%{?dist}
License: LPPL
Group: Applications/Publishing
URL: http://www.cse.ohio-state.edu/~gurari/TeX4ht/
Source0: http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-%{version}.tar.gz
# Source1 is only used for documentation
# renamed to tex4ht-all-YYYYMMDD.zip - based on last timestamp in directory
-Source1: tex4ht-all-20070609.zip
+Source1: tex4ht-all-20080616.zip
# unversioned upstream source, downloaded with wget -N
#Source1 http://www.cse.ohio-state.edu/~gurari/TeX4ht/tex4ht-all.zip
Source2: tex4ht-lppl.txt
# unversioned upstream litteral source, downloaded with wget -N
#Source3: http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-lit.zip
-Source3: tex4ht-lit-20080229.zip
+Source3: tex4ht-lit-20080616.zip
Source4: http://www.cse.ohio-state.edu/~gurari/tpf/ProTex.sty
Source5: http://www.cse.ohio-state.edu/~gurari/tpf/AlProTex.sty
Source6: http://www.cse.ohio-state.edu/~gurari/tpf/DraTex.sty
Source7: http://www.cse.ohio-state.edu/~gurari/tpf/AlDraTex.sty
# debian
-Patch1: http://ftp.de.debian.org/debian/pool/main/t/tex4ht/tex4ht_20080228-1.diff.gz
+Patch1: http://ftp.de.debian.org/debian/pool/main/t/tex4ht/tex4ht_20080701-2.diff.gz
# debian patch rebased
#Patch2: fix_tex4ht_env.diff
# update debian rebuild script
@@ -44,9 +44,9 @@
Requires: netpbm-progs
# ImageMagick, pstoedit depends on ghostscript and gs is in ghostscript
Requires: ImageMagick pstoedit
-# dvips is in texlive-dvips. texlive-latex provides tetex-latex and
-# depends on texlive-dvips.
-Requires: tetex-latex /usr/bin/dvipng
+# for all the conversion scripts
+Requires: tex(latex) tex(dvips) tex(context) tex(xetex) texinfo-tex
+Requires: /usr/bin/dvipng
#Requires: java
Requires: java-1.6.0-openjdk
Requires(post): /usr/bin/texhash
@@ -76,6 +76,7 @@
pushd doc/
unzip %{SOURCE1}
rm *.zip
+ rm -r fix
popd
mkdir lit/
pushd lit
@@ -103,9 +104,6 @@
# patches for literate sources
patch -p1 < debian/lit/patches/fix_tex4ht_dir.diff
patch -p1 < debian/lit/patches/fix_tex4ht_fonts_4hf.diff
-#%patch4 -p1 -b .nohome
-
-#%patch3 -p1 -b .rebuild
chmod a+x debian/lit/rebuild.sh
@@ -113,17 +111,13 @@
find texmf -type f -exec chmod a-x \{\} \;
-# add ht shebang
-echo "#! /bin/sh" | cat - bin/unix/ht > ht.new
-mv ht.new bin/unix/ht
-
%build
pushd src
CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRING_H -DHAVE_DIRENT_H -DHAVE_UNISTD_H \
-DHAVE_SYS_DIR_H -DKPATHSEA -DENVFILE=\"%{_texmf}/tex4ht/base/unix/tex4ht.env\""
LDFLAGS=-lkpathsea
-gcc -o tex4ht $CFLAGS tex4ht.c $LDFLAGS
-gcc -o t4ht $CFLAGS t4ht.c $LDFLAGS
+%{__cc} -o tex4ht $CFLAGS tex4ht.c $LDFLAGS
+%{__cc} -o t4ht $CFLAGS t4ht.c $LDFLAGS
# adapted from debian Makefile
mkdir class
@@ -132,6 +126,7 @@
popd
# beware of the %% that have to be protected as %%%%
+# lib is hardcoded because the jvm is there whatever the architecture.
sed \
-e "s;^i.*/ht-fonts/;i%{_texmf}/tex4ht/ht-fonts/;" \
-e "s;^tpath/tex/;t%{_texmf}/;" \
@@ -146,11 +141,12 @@
install -m755 src/tex4ht $RPM_BUILD_ROOT%{_bindir}
install -m755 src/t4ht $RPM_BUILD_ROOT%{_bindir}
#install -m755 bin/ht/unix/* $RPM_BUILD_ROOT%{_bindir}
-install -p -m755 bin/unix/* $RPM_BUILD_ROOT%{_scriptsdir}
-for script in httex htlatex httexi htcontext htxetex htxelatex mk4ht; do
- install -p -m755 bin/unix/$script $RPM_BUILD_ROOT%{_bindir}
+install -p -m755 bin/ht/unix/* $RPM_BUILD_ROOT%{_scriptsdir}
+for script in httex htlatex httexi htcontext htxetex htxelatex; do
+ install -p -m755 bin/ht/unix/$script $RPM_BUILD_ROOT%{_bindir}
done
-install -p -m755 bin/unix/ht $RPM_BUILD_ROOT%{_bindir}/tex4ht-ht
+install -p -m755 bin/ht/unix/ht $RPM_BUILD_ROOT%{_bindir}/tex4ht-ht
+install -p -m755 bin/unix/mk4ht $RPM_BUILD_ROOT%{_bindir}
install -p -m644 src/tex4ht.jar $RPM_BUILD_ROOT%{_scriptsdir}
mkdir -p $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
@@ -197,6 +193,10 @@
texhash > /dev/null 2>&1 || :
%changelog
+* Sat Oct 4 2008 Patrice Dumas <pertusus at free.fr> 1.0.2008_09_16_1413-1
+- update to 2008_09_16_1413
+- adapt to texlive
+
* Sun Apr 13 2008 Patrice Dumas <pertusus at free.fr> 1.0.2008_02_28_2058-3
- xtpipes works only with sun jre (#436608)
- Previous message: rpms/eel2/devel eel-2.24.0-fade.patch, NONE, 1.1 eel2.spec, 1.102, 1.103 eel-2.23.92-fade.patch, 1.3, NONE
- Next message: rpms/bluez-gnome/devel .cvsignore, 1.28, 1.29 bluetooth-sendto-ods-svn.patch, 1.1, 1.2 bluez-gnome.spec, 1.63, 1.64 sources, 1.28, 1.29 05_bluetooth_sendto_dbus-snd.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list