- updated to 2.23 (2.24 misses one required file)

diff --git a/hevea.spec b/hevea.spec
index 503aee62f5e17704477267f5f5ee9d32b8baa16c..219782571151d502b985eaff7062b056440b802f 100644 (file)
--- a/hevea.spec
+++ b/hevea.spec
@@ -1,17 +1,25 @@
+#
+# Conditional build:
+%bcond_without ocaml_opt       # skip building native optimized binaries (bytecode is always built)
+
+%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9
+%undefine      with_ocaml_opt
+%endif
+
 Summary:       LaTeX to html translator
 Summary(pl.UTF-8):     Konwerter z LaTeXa do HTML-a
 Name:          hevea
-Version:       1.10
+# 2.24 has svg.hva file missing
+Version:       2.23
 Release:       1
 License:       Free
 Group:         Applications/Publishing/TeX
-Vendor:                Luc Maranget <Luc.Maranget@inria.fr>
-Source0:       http://para.inria.fr/~maranget/hevea/distri/%{name}-%{version}.tar.gz
-# Source0-md5: 24a631570bee3cc4b8350e9db39be62b
-Source1:       http://para.inria.fr/~maranget/hevea/distri/%{name}-%{version}-manual.pdf
-# Source1-md5: d9cc1d90aa85e0149a058b7fe7d5a9dd
+Source0:       http://para.inria.fr/~maranget/hevea/old/%{name}-%{version}.tar.gz
+# Source0-md5: 38b157e78e8171dc6a47f9ea10d2bd60
+Source1:       http://para.inria.fr/~maranget/hevea/%{name}-2.24-manual.pdf
+# Source1-md5: 82414eb9bd85b69d8ae78e58c99d12c4
 URL:           http://para.inria.fr/~maranget/hevea/
-BuildRequires: ocaml >= 3.09.0
+BuildRequires: ocaml >= 3.12.0
 BuildRequires: texlive-latex
 BuildRequires: texlive-dvips
 Requires:      ghostscript >= 4.03
@@ -19,6 +27,7 @@ Requires:     texlive-latex >= 0.4
 Requires:      texlive-dvips >= 0.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                make_target             %{?with_ocaml_opt:opt}%{!?with_ocaml_opt:byte}
 %define                _latexheveadir          %{_datadir}/texmf/tex/latex/%{name}
 
 %description
@@ -35,11 +44,10 @@ akceptowany), a pliki wynikowe HTML są zgodne ze standardem 4.0.
 %prep
 %setup -q
 cp -f %{SOURCE1} manual.pdf
-%{__rm} config.sh
 
 %build
 %{__make} config.sh \
-       TARGET=opt \
+       TARGET=%{make_target} \
        PREFIX=%{_prefix} \
        LIBDIR=%{_datadir}/%{name} \
        LATEXLIBDIR=%{_latexheveadir} \
@@ -47,13 +55,15 @@ cp -f %{SOURCE1} manual.pdf
        DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} \
-       TARGET=opt
+       TARGET=%{make_target}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_latexheveadir},%{_datadir},%{_bindir}}
 
-%{__make} install
+%{__make} install \
+       TARGET=%{make_target} \
+       DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,7 +74,20 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc CHANGES README LICENSE manual.pdf
-%attr(-,  root,root) %{_datadir}/%{name}
-%attr(755,root,root) %dir %{_latexheveadir}
-%attr(755,root,root) %{_bindir}/*
-%{_latexheveadir}/*.sty
+%attr(755,root,root) %{_bindir}/bibhva
+%attr(755,root,root) %{_bindir}/esponja
+%attr(755,root,root) %{_bindir}/hacha
+%attr(755,root,root) %{_bindir}/hevea
+%attr(755,root,root) %{_bindir}/imagen
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/html
+%{_datadir}/%{name}/info
+%{_datadir}/%{name}/mappings
+%{_datadir}/%{name}/text
+%{_datadir}/%{name}/*.gif
+%{_datadir}/%{name}/*.hva
+%{_datadir}/%{name}/*.sty
+%attr(755,root,root) %{_datadir}/%{name}/imagen
+%attr(755,root,root) %{_datadir}/%{name}/*.exe
+%dir %{_latexheveadir}
+%{_latexheveadir}/hevea.sty