rpms/tetex-tex4ht/F-8 .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)]

Author: pertusus

Update of /cvs/extras/rpms/tetex-tex4ht/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1953

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.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/F-8/.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	9 Mar 2008 14:45:10 -0000	1.11
@@ -1,4 +1,4 @@
-tex4ht-1.0.2007_09_04_0340.tar.gz
+tex4ht_20071211-2.diff.gz
+tex4ht-lit-20071220.zip
 tex4ht-all-20070609.zip
-tex4ht-lit-20070904.zip
-tex4ht_20070904-1.diff.gz
+tex4ht-1.0.2007_12_19_2154.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-8/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	9 Mar 2008 14:45:10 -0000	1.12
@@ -1,4 +1,4 @@
-dc7d1b45f9053ad3387eaadda2167b5b  tex4ht-1.0.2007_09_04_0340.tar.gz
+92845008562a935dd214358e2491df75  tex4ht_20071211-2.diff.gz
+0789ef4f7c6983747301d41228633391  tex4ht-lit-20071220.zip
 32fa3f44611fd86259aad939444b87d8  tex4ht-all-20070609.zip
-bd797ccaf2f6819f21ce4e8827cee519  tex4ht-lit-20070904.zip
-a0650cd770a1362fb054c3cf1a3ec6b2  tex4ht_20070904-1.diff.gz
+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/F-8/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	9 Mar 2008 14:45:10 -0000	1.3
@@ -1,25 +1,15 @@
-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_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
  
- # 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-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./"
- xhlatex tex4ht-html-speech "html,3,sections+"
+ for htype in info-mml info-svg info-javahelp info-ooffice
+ do
+-   latex tex4ht-${htype}.tex
+-   latex tex4ht-${htype}.tex
+-   latex tex4ht-${htype}.tex
+-   #htlatex tex4ht-${htype} "html,sections+"
++   htlatex tex4ht-${htype} "html,sections+"
+ done
  
- movefiles
+ latex tex4ht-bibtex2


Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-8/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	9 Mar 2008 14:45:10 -0000	1.13
@@ -4,8 +4,8 @@
 
 Summary:       Translates TeX and LaTeX into HTML or XML+MathML
 Name:          tetex-tex4ht
-Version:       1.0.2007_09_04_0340
-Release:       1%{?dist}
+Version:       1.0.2007_12_19_2154
+Release:       2%{?dist}.1
 License:       LPPL
 Group:         Applications/Publishing
 URL:           http://www.cse.ohio-state.edu/~gurari/TeX4ht/
@@ -18,21 +18,20 @@
 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-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)
 
+# kpsewhich should be brought in by kpathsea-devel anyway
 BuildRequires:  /usr/bin/kpsewhich
-BuildRequires:  tetex-fonts
+#BuildRequires:  kpathsea-devel
 BuildRequires:  java-devel /usr/bin/fastjar
 # for uudecode to generate the debian tutorial images
 BuildRequires:  sharutils
@@ -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,17 @@
 texhash > /dev/null 2>&1 || :
 
 %changelog
+* Mon Dec 31 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_12_19_2154-1.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
+
+* 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