rpms/tetex-tex4ht/devel .cvsignore, 1.12, 1.13 sources, 1.13, 1.14 tetex-tex4ht-1.0-rebuild.patch, 1.4, 1.5 tetex-tex4ht.spec, 1.14, 1.15
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Fri Jan 4 11:57:22 UTC 2008
Author: pertusus
Update of /cvs/extras/rpms/tetex-tex4ht/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23620
Modified Files:
.cvsignore sources tetex-tex4ht-1.0-rebuild.patch
tetex-tex4ht.spec
Log Message:
* Mon Dec 31 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_12_19_2154-1
- update to 1.0.2007_12_19_2154
- new debian patch, new literate sources
- adapt for texlive
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 25 Nov 2007 10:58:06 -0000 1.12
+++ .cvsignore 4 Jan 2008 11:56:40 -0000 1.13
@@ -1,4 +1,4 @@
+tex4ht_20071211-2.diff.gz
+tex4ht-lit-20071220.zip
tex4ht-all-20070609.zip
-tex4ht_20070904-1.diff.gz
-tex4ht-1.0.2007_11_19_2329.tar.gz
-tex4ht-lit-20071120.zip
+tex4ht-1.0.2007_12_19_2154.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 25 Nov 2007 10:58:06 -0000 1.13
+++ sources 4 Jan 2008 11:56:40 -0000 1.14
@@ -1,4 +1,4 @@
+92845008562a935dd214358e2491df75 tex4ht_20071211-2.diff.gz
+0789ef4f7c6983747301d41228633391 tex4ht-lit-20071220.zip
32fa3f44611fd86259aad939444b87d8 tex4ht-all-20070609.zip
-a0650cd770a1362fb054c3cf1a3ec6b2 tex4ht_20070904-1.diff.gz
-d295f6c899848ed6331b21a1675a8a0f tex4ht-1.0.2007_11_19_2329.tar.gz
-a30930c2d0fcf0f52a6d6ab0a46204cf tex4ht-lit-20071120.zip
+f1b9eeb9d39364cc0fe21727665f0edd tex4ht-1.0.2007_12_19_2154.tar.gz
tetex-tex4ht-1.0-rebuild.patch:
Index: tetex-tex4ht-1.0-rebuild.patch
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht-1.0-rebuild.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tetex-tex4ht-1.0-rebuild.patch 25 Nov 2007 10:58:06 -0000 1.4
+++ tetex-tex4ht-1.0-rebuild.patch 4 Jan 2008 11:56:40 -0000 1.5
@@ -1,150 +1,15 @@
-diff -up tex4ht-1.0.2007_11_19_2329/debian/lit/rebuild.sh.rebuild tex4ht-1.0.2007_11_19_2329/debian/lit/rebuild.sh
---- tex4ht-1.0.2007_11_19_2329/debian/lit/rebuild.sh.rebuild 2007-11-23 23:54:18.000000000 +0100
-+++ tex4ht-1.0.2007_11_19_2329/debian/lit/rebuild.sh 2007-11-24 23:08:47.000000000 +0100
-@@ -70,7 +70,7 @@ export LANG LC_CTYPE PATH
- function texclean()
- {
+diff -up tex4ht-1.0.2007_12_19_2154/debian/lit/rebuild.sh.rebuild tex4ht-1.0.2007_12_19_2154/debian/lit/rebuild.sh
+--- tex4ht-1.0.2007_12_19_2154/debian/lit/rebuild.sh.rebuild 2008-01-01 01:08:01.000000000 +0100
++++ tex4ht-1.0.2007_12_19_2154/debian/lit/rebuild.sh 2008-01-01 01:10:45.000000000 +0100
+@@ -273,10 +273,7 @@ htlatex tex4ht-ooffice "xhtml,3,sections
-- rm -f *.{aux,dvi,idv,4tc,4ct,log,lg,xref,tmp,trc} mktex4ht.cnf
-+ rm -f *.{aux,dvi,idv,ps,4tc,4ct,log,lg,xref,tmp,trc} mktex4ht.cnf
-
- }
-
-@@ -80,9 +80,9 @@ function mkdirheir()
- {
- mkdir -p ${DESTDIR}/texmf/tex/generic/tex4ht
- mkdir -p ${DESTDIR}/bin/{unix,win32,linux}
-- mkdir -p ${DESTDIR}/texmf/tex4ht/{xttl,bin,ht-fonts}
-+ mkdir -p ${DESTDIR}/texmf/tex4ht/{xttl,xtpipes,bin,ht-fonts}
- mkdir -p ${DESTDIR}/texmf/tex4ht/base/{unix,win32}
-- mkdir -p ${DESTDIR}/src
-+ mkdir -p ${DESTDIR}/src/java
- mkdir -p ${DESTDIR}/litdoc
- }
-
-@@ -124,9 +124,11 @@ function setupenv()
- function movefiles()
- {
- # Run within ${DESTDIR}
-- mv -f *.tex *.sty *.4ht texmf/tex/generic/tex4ht/
-- mv -f tex4ht.env-unix texmf/tex4ht/base/unix/tex4ht.env
-- mv -f tex4ht.env-win32 texmf/tex4ht/base/win32/tex4ht.env
-+ set +e
-+ mv -f *.sty *.4ht texmf/tex/generic/tex4ht/
-+ mv -f m-tex4ht.tex texmf/tex/generic/tex4ht/
-+ [ -f tex4ht.env-unix ] && mv -f tex4ht.env-unix texmf/tex4ht/base/unix/tex4ht.env
-+ [ -f tex4ht.env-win32 ] && mv -f tex4ht.env-win32 texmf/tex4ht/base/win32/tex4ht.env
- mv -f *.c src
- mv -f *.{html,png,css} litdoc/
- cp -p mk4ht.perl bin/win32/mk4ht
-@@ -137,8 +139,12 @@ function movefiles()
- mv -f $i bin/unix/$j
- done
- mv -f *.bat bin/win32
-- mv -f *.4xt *.dtd texmf/tex4ht/xttl/
-- mv -f *.java *.class texmf/tex4ht/bin/
-+ cp -p *.4xt texmf/tex4ht/xttl/
-+ mv -f *.dtd *.4xt texmf/tex4ht/xtpipes/
-+# .class are not generated, and they are scattered at different places
-+# mv -f *.class src/class/
-+ mv -f *.java work.dir/* src/java/
-+ set -e
- }
-
- # Sanity check
-@@ -221,6 +227,8 @@ tex tex4ht-cond4ht
- tex ./cond4ht.4ht
- latex tex4ht-options
-
-+tex tex4ht-htcmd
-+
- # Make first move and clean
- movefiles
- texclean
-@@ -245,27 +253,41 @@ fi
-
- # For 23 html ht styles. It is important that
- # The current directory be the last in the search
--# path for some of these builds to work.
--for htype in html4 html-speech info info-mml info-html4 \
-- html0 html32 docbook info-svg \
-- jsmath javahelp info-javahelp mathml mathltx mathplayer \
-- moz ooffice info-ooffice tei svg word unicode bibtex2
-+# path for some of these builds to work. ?? Is it still true?
-+# Seems that html4 needs to be done first
-+
-+for htype in html4 html-speech info info-html4 html0 html32 \
-+ docbook jsmath jsml javahelp mathml mathltx mathplayer moz \
-+ tei svg word unicode
-+do
-+ xhlatex tex4ht-${htype} "html,3,sections+"
-+done
-+
-+htlatex tex4ht-ooffice "xhtml,3,sections+"
-+
-+for htype in info-mml info-svg info-javahelp info-ooffice
+ for htype in info-mml info-svg info-javahelp info-ooffice
do
- latex tex4ht-${htype}.tex
- latex tex4ht-${htype}.tex
- latex tex4ht-${htype}.tex
-- movefiles
-- texclean
-+ #htlatex tex4ht-${htype} "html,sections+"
+- latex tex4ht-${htype}.tex
+- latex tex4ht-${htype}.tex
+- latex tex4ht-${htype}.tex
+- #htlatex tex4ht-${htype} "html,sections+"
++ htlatex tex4ht-${htype} "html,sections+"
done
-+latex tex4ht-bibtex2
-+
- # The xttl files are for the experimental speech support.
--# These are built using xhlatex.
-+# use javac
-+# and xttl/jsml.4xt, and base/*/xv4ht.cat and the xtpipes dtd
- htlatex xtpipes "xhtml,3,next" "" "-d./"
--xhlatex tex4ht-docbook-xttl "html,next,3" "" "-d./"
--xhlatex tex4ht-oo-xttl "html,next,3" "" "-d./"
--xhlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
--htlatex tex4ht-xhtml-xttl "xhtml,next,3" "" "-d./"
--xhlatex tex4ht-html-speech "html,3,sections+"
-+#xhlatex tex4ht-docbook-xttl "html,next,3" "" "-d./"
-+htlatex tex4ht-docbook-xtpipes "xhtml,next,3" "" "-d./"
-+#xhlatex tex4ht-oo-xttl "html,next,3" "" "-d./"
-+htlatex tex4ht-oo-xtpipes "xhtml,next,3" "" "-d./"
-+#xhlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
-+htlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
-+#htlatex tex4ht-xhtml-xttl "xhtml,next,3" "" "-d./"
-+htlatex tex4ht-xhtml-xtpipes "xhtml,next,3" "" "-d./"
-+htlatex tex4ht-jsml-xtpipes "xhtml,next,3" "" "-d./"
-
- movefiles
- texclean
-@@ -273,20 +295,15 @@ texclean
- # Make font files. The Needs directives in this file cause "t4ht" to
- # move the files into their correct locations automatically.
- for font in noncjk cjk; do
--tex tex4ht-fonts-${font}
--tex tex4ht-fonts-${font}
--tex4ht tex4ht-fonts-${font}
--t4ht tex4ht-fonts-${font}
--done
--for font in 4hf; do
--latex tex4ht-fonts-${font}
--latex tex4ht-fonts-${font}
--tex4ht tex4ht-fonts-${font}
--t4ht tex4ht-fonts-${font}
-+ ht tex tex4ht-fonts-${font}
- done
-
-+htlatex tex4ht-fonts-4hf "xhtml,3"
-+
- movefiles
- texclean
-+# also remove the htf files that are already copied as stated above
-+rm -f *.htf
-
- # That's it.
-
-@@ -298,5 +315,4 @@ exit 0
- # 2. tex4ht-fonts-modern.tex is input by tex4ht-fonts-noncjk.tex and is
- # not built separately
- # 3. wripro.tex seems to be something specific for Windows/Mathematica?
--# 4. htcmd is an older version of mk4ht which is no longer used.
-
+ latex tex4ht-bibtex2
Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tetex-tex4ht.spec 25 Nov 2007 10:58:06 -0000 1.14
+++ tetex-tex4ht.spec 4 Jan 2008 11:56:40 -0000 1.15
@@ -4,7 +4,7 @@
Summary: Translates TeX and LaTeX into HTML or XML+MathML
Name: tetex-tex4ht
-Version: 1.0.2007_11_19_2329
+Version: 1.0.2007_12_19_2154
Release: 1%{?dist}
License: LPPL
Group: Applications/Publishing
@@ -18,20 +18,19 @@
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-20071120.zip
+Source3: tex4ht-lit-20071220.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_20070904-1.diff.gz
-# patch similar from debian/lit/texmf.cnf.patch, modified to fit fedora
-Patch2: texmf.cnf.patch
+Patch1: http://ftp.de.debian.org/debian/pool/main/t/tex4ht/tex4ht_20071211-2.diff.gz
# update debian rebuild script
-Patch3: tetex-tex4ht-1.0-rebuild.patch
+#Patch3: tetex-tex4ht-1.0-rebuild.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: /usr/bin/kpsewhich
+BuildRequires: kpathsea-devel
BuildRequires: tetex-fonts
BuildRequires: java-devel /usr/bin/fastjar
# for uudecode to generate the debian tutorial images
@@ -40,9 +39,9 @@
Requires: netpbm-progs
# ImageMagick, pstoedit depends on ghostscript and gs is in ghostscript
Requires: ImageMagick pstoedit
-# dvips is in tetex-dvips. tetex-latex depends on tetex-dvips.
-# dvipng is in tetex. tetex-latex depends on tetex.
-Requires: tetex-latex
+# dvips is in texlive-dvips. texlive-latex provides tetex-latex and
+# depends on texlive-dvips.
+Requires: tetex-latex /usr/bin/dvipng
Requires: java
Requires(post): /usr/bin/texhash
Requires(postun): /usr/bin/texhash
@@ -81,23 +80,25 @@
cp -p %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} lit/
# avoid duplicating the debian patches
-# used as a source of inspiration
-patch -p1 < debian/patches/add_Makefile.diff
-patch -p1 < debian/patches/add_xtpipes_support
-patch -p1 < debian/patches/add_manpage.diff
-# not used
-patch -p1 < debian/patches/add_scripts_sh.diff
patch -p1 < debian/patches/fix_mk4ht.diff
# hardcoded /usr/share
patch -p1 < debian/patches/fix_tex4ht_env.diff
+# use the debian man page
+patch -p1 < debian/patches/add_manpage.diff
+# Makefile used as a source of inspiration
+patch -p1 < debian/patches/add_Makefile.diff
+patch -p1 < debian/patches/add_xtpipes_support
+patch -p1 < debian/patches/Makefile_indep_arch
+# scripts and texmf.cnf excerpt for debian not used
+patch -p1 < debian/patches/add_scripts_sh.diff
+patch -p1 < debian/patches/add_texmf_cnf.diff
+# 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
-cp -p %{PATCH2} debian/lit/
-
-%patch3 -p1 -b .rebuild
+#%patch3 -p1 -b .rebuild
chmod a+x debian/lit/rebuild.sh
@@ -191,6 +192,11 @@
texhash > /dev/null 2>&1 || :
%changelog
+* Mon Dec 31 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_12_19_2154-1
+- update to 1.0.2007_12_19_2154
+- new debian patch, new literate sources
+- adapt for texlive
+
* Sun Nov 25 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_11_19_2329-1
- update to 1.0.2007_11_19_2329 and use new literate sources
More information about the fedora-extras-commits
mailing list