rpms/tetex-tex4ht/F-8 tetex-tex4ht.spec,1.15,1.16

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	tetex-tex4ht.spec 
Log Message:
no java icedtea on ppc ppc64


Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-8/tetex-tex4ht.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- tetex-tex4ht.spec	13 Apr 2008 22:38:37 -0000	1.15
+++ tetex-tex4ht.spec	13 Apr 2008 22:52:36 -0000	1.16
@@ -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:       3%{?dist}
+Release:       3%{?dist}.1
 License:       LPPL
 Group:         Applications/Publishing
 URL:           http://www.cse.ohio-state.edu/~gurari/TeX4ht/
@@ -34,9 +34,13 @@
 # kpsewhich should be brought in by kpathsea-devel anyway
 BuildRequires:  /usr/bin/kpsewhich
 #BuildRequires:  kpathsea-devel
-#BuildRequires:  java-devel
+# no icedtea on ppc/ppc64
+%ifarch ppc ppc64
+BuildRequires:  java-devel
+%else
 # Doesn't run with gcj, so better build it with icedtea/openjdk too
 BuildRequires:  java-1.7.0-icedtea-devel
+%endif
 BuildRequires:  /usr/bin/fastjar
 # for uudecode to generate the debian tutorial images
 BuildRequires:  sharutils
@@ -47,8 +51,12 @@
 # dvips is in texlive-dvips. texlive-latex provides tetex-latex and 
 # depends on texlive-dvips.
 Requires:       tetex-latex /usr/bin/dvipng
-#Requires:       java
+# no icedtea on ppc/ppc64
+%ifarch ppc ppc64
+Requires:       java
+%else
 Requires:       java-1.7.0-icedtea
+%endif
 Requires(post):   /usr/bin/texhash
 Requires(postun): /usr/bin/texhash
 Obsoletes:      tex4ht < %{version}-%{release}
@@ -136,7 +144,9 @@
   -e "s;^i.*/ht-fonts/;i%{_texmf}/tex4ht/ht-fonts/;" \
   -e "s;^tpath/tex/;t%{_texmf}/;" \
   -e "s;%%%%~/texmf-dist/;%{_texmf}/;" \
+%ifnarch ppc ppc64
   -e 's;^\(\.[^ ]\+\) java;\1 /usr/lib/jvm/jre-icedtea/bin/java;' \
+%endif
  texmf/tex4ht/base/unix/tex4ht.env > tex4ht.env
 
 %install
@@ -197,7 +207,7 @@
 texhash > /dev/null 2>&1 || :
 
 %changelog
-* Sun Apr 13 2008 Patrice Dumas <pertusus at free.fr> 1.0.2008_02_28_2058-3
+* Sun Apr 13 2008 Patrice Dumas <pertusus at free.fr> 1.0.2008_02_28_2058-3.1
 - xtpipes works only with sun jre (#436608)
 
 * Sat Mar  1 2008 Patrice Dumas <pertusus at free.fr> 1.0.2008_02_28_2058-1