rpms/tetex-tex4ht/devel tetex-tex4ht.spec,1.18,1.19

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	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)



Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tetex-tex4ht.spec	11 Apr 2008 22:58:51 -0000	1.18
+++ tetex-tex4ht.spec	13 Apr 2008 22:07:08 -0000	1.19
@@ -5,7 +5,7 @@
 Summary:       Translates TeX and LaTeX into HTML or XML+MathML
 Name:          tetex-tex4ht
 Version:       1.0.2008_02_28_2058
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LPPL
 Group:         Applications/Publishing
 URL:           http://www.cse.ohio-state.edu/~gurari/TeX4ht/
@@ -34,7 +34,9 @@
 # kpsewhich should be brought in by kpathsea-devel anyway
 BuildRequires:  /usr/bin/kpsewhich
 BuildRequires:  kpathsea-devel
-BuildRequires:  java-devel /usr/bin/fastjar
+#BuildRequires:  java-devel /usr/bin/fastjar
+# Doesn't run with gcj, so better build it with icedtea/openjdk too
+BuildRequires:  java-1.6.0-openjdk-devel
 # for uudecode to generate the debian tutorial images
 BuildRequires:  sharutils
 # pnmcrop and pnmtopng are in netpbm-progs. 
@@ -44,7 +46,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.6.0-openjdk
 Requires(post):   /usr/bin/texhash
 Requires(postun): /usr/bin/texhash
 Obsoletes:      tex4ht < %{version}-%{release}
@@ -132,6 +135,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-openjdk/bin/java;' \
  texmf/tex4ht/base/unix/tex4ht.env > tex4ht.env
 
 %install
@@ -192,6 +196,9 @@
 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