rpms/tetex-tex4ht/F-8 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 tetex-tex4ht.spec, 1.13, 1.14

Sun Apr 13 22:29:05 UTC 2008

Author: pertusus

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

Modified Files:
	.cvsignore sources tetex-tex4ht.spec 
Log Message:
* Sun Apr 13 2008 Patrice Dumas <pertusus at free.fr> 1.0.2008_02_28_2058-2
- xtpipes works only with sun jre (#436608)

* Sat Mar  1 2008 Patrice Dumas <pertusus at free.fr> 1.0.2008_02_28_2058-1
- update to 1.0.2008_02_28_2058
- new debian patch, new literate sources




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-8/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12

--- .cvsignore	9 Mar 2008 14:45:10 -0000	1.11
+++ .cvsignore	13 Apr 2008 22:28:23 -0000	1.12
@@ -1,4 +1,4 @@
-tex4ht_20071211-2.diff.gz
-tex4ht-lit-20071220.zip
+tex4ht_20080228-1.diff.gz
 tex4ht-all-20070609.zip
-tex4ht-1.0.2007_12_19_2154.tar.gz
+tex4ht-lit-20080229.zip
+tex4ht-1.0.2008_02_28_2058.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	9 Mar 2008 14:45:10 -0000	1.12
+++ sources	13 Apr 2008 22:28:23 -0000	1.13
@@ -1,4 +1,4 @@
-92845008562a935dd214358e2491df75  tex4ht_20071211-2.diff.gz
-0789ef4f7c6983747301d41228633391  tex4ht-lit-20071220.zip
+0c5f4a6f3dd275e90adfa0317ffbb898  tex4ht_20080228-1.diff.gz
 32fa3f44611fd86259aad939444b87d8  tex4ht-all-20070609.zip
-f1b9eeb9d39364cc0fe21727665f0edd  tex4ht-1.0.2007_12_19_2154.tar.gz
+0b3c6273ec0e1d35cce9677324690f4e  tex4ht-lit-20080229.zip
+dc9d78c8ad22acd4b40dfd2cbbe2b8de  tex4ht-1.0.2008_02_28_2058.tar.gz


Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-8/tetex-tex4ht.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tetex-tex4ht.spec	9 Mar 2008 14:45:10 -0000	1.13
+++ tetex-tex4ht.spec	13 Apr 2008 22:28:23 -0000	1.14
@@ -4,8 +4,8 @@
 
 Summary:       Translates TeX and LaTeX into HTML or XML+MathML
 Name:          tetex-tex4ht
-Version:       1.0.2007_12_19_2154
-Release:       2%{?dist}.1
+Version:       1.0.2008_02_28_2058
+Release:       2%{?dist}
 License:       LPPL
 Group:         Applications/Publishing
 URL:           http://www.cse.ohio-state.edu/~gurari/TeX4ht/
@@ -18,21 +18,26 @@
 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-20071220.zip
+Source3:       tex4ht-lit-20080229.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_20071211-2.diff.gz
+Patch1:        http://ftp.de.debian.org/debian/pool/main/t/tex4ht/tex4ht_20080228-1.diff.gz
+# debian patch rebased
+#Patch2:        fix_tex4ht_env.diff
 # update debian rebuild script
 #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:  kpathsea-devel
-BuildRequires:  java-devel /usr/bin/fastjar
+BuildRequires:  kpathsea-devel
+#BuildRequires:  java-devel
+# Doesn't run with gcj, so better build it with icedtea/openjdk too
+BuildRequires:  java-1.7.0-icedtea-devel
+BuildRequires:  /usr/bin/fastjar
 # for uudecode to generate the debian tutorial images
 BuildRequires:  sharutils
 # pnmcrop and pnmtopng are in netpbm-progs. 
@@ -42,7 +47,8 @@
 # dvips is in texlive-dvips. texlive-latex provides tetex-latex and 
 # depends on texlive-dvips.
 Requires:       tetex-latex /usr/bin/dvipng
-Requires:       java
+#Requires:       java
+Requires:       java-1.7.0-icedtea
 Requires(post):   /usr/bin/texhash
 Requires(postun): /usr/bin/texhash
 Obsoletes:      tex4ht < %{version}-%{release}
@@ -82,6 +88,7 @@
 # avoid duplicating the debian patches
 patch -p1 < debian/patches/fix_mk4ht.diff
 # hardcoded /usr/share
+#%patch2 -p1
 patch -p1 < debian/patches/fix_tex4ht_env.diff
 # use the debian man page
 patch -p1 < debian/patches/add_manpage.diff
@@ -129,6 +136,7 @@
   -e "s;^i.*/ht-fonts/;i%{_texmf}/tex4ht/ht-fonts/;" \
   -e "s;^tpath/tex/;t%{_texmf}/;" \
   -e "s;%%%%~/texmf-dist/;%{_texmf}/;" \
+  -e 's;^\(\.[^ ]\+\) java;\1 /usr/lib/jvm/jre-icedtea/bin/java;' \
  texmf/tex4ht/base/unix/tex4ht.env > tex4ht.env
 
 %install
@@ -158,9 +166,6 @@
 
 cp -pr debian/html tutorial
 
-sed 's/Debian packaged/Debian and Fedora packaged/' debian/README.kpathsea \
-   > README.kpathsea 
-
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 sed -e 's;@SCRIPTSDIR@;%{_scriptsdir};' \
  -e 's;@TEX4HTDIR@;%{_texmf}/tex4ht/base/unix;' \
@@ -183,7 +188,7 @@
 %{_bindir}/t4ht
 %{_scriptsdir}/
 %{_mandir}/man1/tex4ht.1*
-%doc lppl.txt doc tutorial README.kpathsea 
+%doc lppl.txt doc tutorial debian/README.kpathsea 
 
 %post
 texhash > /dev/null 2>&1 || :
@@ -192,6 +197,13 @@
 texhash > /dev/null 2>&1 || :
 
 %changelog
+* Sun Apr 13 2008 Patrice Dumas <pertusus at free.fr> 1.0.2008_02_28_2058-2
+- xtpipes works only with sun jre (#436608)
+
+* Sat Mar  1 2008 Patrice Dumas <pertusus at free.fr> 1.0.2008_02_28_2058-1
+- update to 1.0.2008_02_28_2058
+- new debian patch, new literate sources
+
 * 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


