rpms/tetex-tex4ht/devel tetex-tex4ht-1.0-biblio.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.11, 1.12 tetex-tex4ht-1.0-rebuild.patch, 1.2, 1.3 tetex-tex4ht.spec, 1.12, 1.13

Patrice Dumas (pertusus) fedora-extras-commits at redhat.com
Mon Nov 12 11:40:01 UTC 2007


Author: pertusus

Update of /cvs/extras/rpms/tetex-tex4ht/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8478

Modified Files:
	.cvsignore sources tetex-tex4ht-1.0-rebuild.patch 
	tetex-tex4ht.spec 
Added Files:
	tetex-tex4ht-1.0-biblio.patch 
Log Message:
* Sun Nov 11 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_11_07_1645-1
- update to 1.0.2007_11_07_1645


tetex-tex4ht-1.0-biblio.patch:

--- NEW FILE tetex-tex4ht-1.0-biblio.patch ---
diff -up tex4ht-1.0.2007_11_07_1645/lit/tex4ht-fonts-4hf.tex.biblio tex4ht-1.0.2007_11_07_1645/lit/tex4ht-fonts-4hf.tex
--- tex4ht-1.0.2007_11_07_1645/lit/tex4ht-fonts-4hf.tex.biblio	2007-11-11 04:21:11.000000000 +0100
+++ tex4ht-1.0.2007_11_07_1645/lit/tex4ht-fonts-4hf.tex	2007-11-11 04:21:32.000000000 +0100
@@ -37486,9 +37486,9 @@ GBK is a subset of GB18030. GBK has 2394
 
 
 %%%%%%%%%%%%%%%%%%
-\begin{thebibliography}
+\begin{thebibliography}{99}
 %%%%%%%%%%%%%%%%%%
-\bibitem
+\bibitem{stixfonts}
 http://www.stixfonts.org/
 %%%%%%%%%%%%%%%%%%
 \end{thebibliography}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Sep 2007 09:53:30 -0000	1.10
+++ .cvsignore	12 Nov 2007 11:39:27 -0000	1.11
@@ -1,4 +1,4 @@
-tex4ht-1.0.2007_09_04_0340.tar.gz
-tex4ht-all-20070609.zip
-tex4ht-lit-20070904.zip
+tex4ht-1.0.2007_11_07_1645.tar.gz
 tex4ht_20070904-1.diff.gz
+tex4ht-all-20070609.zip
+tex4ht-lit-20071107.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Sep 2007 09:53:30 -0000	1.11
+++ sources	12 Nov 2007 11:39:27 -0000	1.12
@@ -1,4 +1,4 @@
-dc7d1b45f9053ad3387eaadda2167b5b  tex4ht-1.0.2007_09_04_0340.tar.gz
-32fa3f44611fd86259aad939444b87d8  tex4ht-all-20070609.zip
-bd797ccaf2f6819f21ce4e8827cee519  tex4ht-lit-20070904.zip
+2f421c11809f4de156b8261171d0c288  tex4ht-1.0.2007_11_07_1645.tar.gz
 a0650cd770a1362fb054c3cf1a3ec6b2  tex4ht_20070904-1.diff.gz
+32fa3f44611fd86259aad939444b87d8  tex4ht-all-20070609.zip
+39aa0be5ed7dfa04f31e7bea7f3b5a73  tex4ht-lit-20071107.zip

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tetex-tex4ht-1.0-rebuild.patch	21 Sep 2007 09:53:30 -0000	1.2
+++ tetex-tex4ht-1.0-rebuild.patch	12 Nov 2007 11:39:27 -0000	1.3
@@ -1,10 +1,89 @@
-diff -up tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh.rebuild tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh
---- tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh.rebuild	2007-09-21 07:52:12.000000000 +0200
-+++ tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh	2007-09-21 08:01:07.000000000 +0200
-@@ -260,11 +260,17 @@ done
+diff -up tex4ht-1.0.2007_11_07_1645/debian/lit/rebuild.sh.rebuild tex4ht-1.0.2007_11_07_1645/debian/lit/rebuild.sh
+--- tex4ht-1.0.2007_11_07_1645/debian/lit/rebuild.sh.rebuild	2007-11-12 10:43:00.000000000 +0100
++++ tex4ht-1.0.2007_11_07_1645/debian/lit/rebuild.sh	2007-11-12 11:41:36.000000000 +0100
+@@ -70,7 +70,7 @@ export LANG LC_CTYPE PATH
+ function texclean()
+ {
+ 
+-  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
+@@ -245,27 +251,38 @@ 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 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 bibtex2
+ do
+    latex tex4ht-${htype}.tex
+    latex tex4ht-${htype}.tex
+    latex tex4ht-${htype}.tex
+-   movefiles
+-   texclean
+ done
  
  # The xttl files are for the experimental speech support.
- # These are built using xhlatex.
+-# 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./"
@@ -12,6 +91,7 @@
 -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./"
@@ -20,6 +100,33 @@
 +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./"
- xhlatex tex4ht-html-speech "html,3,sections+"
++htlatex tex4ht-jsml-xtpipes "xhtml,next,3" "" "-d./"
+ 
+ movefiles
+ texclean
+@@ -273,20 +290,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.
+ 


Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tetex-tex4ht.spec	21 Sep 2007 09:53:30 -0000	1.12
+++ tetex-tex4ht.spec	12 Nov 2007 11:39:27 -0000	1.13
@@ -4,7 +4,7 @@
 
 Summary:       Translates TeX and LaTeX into HTML or XML+MathML
 Name:          tetex-tex4ht
-Version:       1.0.2007_09_04_0340
+Version:       1.0.2007_11_07_1645
 Release:       1%{?dist}
 License:       LPPL
 Group:         Applications/Publishing
@@ -18,7 +18,7 @@
 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-20070904.zip
+Source3:       tex4ht-lit-20071107.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
@@ -29,6 +29,7 @@
 Patch2:        texmf.cnf.patch
 # update debian rebuild script
 Patch3:        tetex-tex4ht-1.0-rebuild.patch
+Patch4:        tetex-tex4ht-1.0-biblio.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  /usr/bin/kpsewhich
@@ -98,6 +99,7 @@
 cp -p %{PATCH2} debian/lit/
 
 %patch3 -p1 -b .rebuild
+%patch4 -p1 -b .biblio
 
 chmod a+x debian/lit/rebuild.sh
 
@@ -191,6 +193,9 @@
 texhash > /dev/null 2>&1 || :
 
 %changelog
+* Sun Nov 11 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_11_07_1645-1
+- update to 1.0.2007_11_07_1645
+
 * Fri Sep 21 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_09_04_0340-1
 - update to 1.0.2007_09_04_0340
 - use all the debian patches




More information about the fedora-extras-commits mailing list