- some cosmetics,

[packages/ocaml.git] / ocaml.spec

diff --git a/ocaml.spec b/ocaml.spec
index 67f2a60de3d1b114683d29de12f2e5e733a806f3..c103bc5377a0dedfcde7978690adef6337c200de 100644 (file)
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -1,16 +1,18 @@
 Summary:       The Objective Caml compiler and programming environment
 Summary(pl):   Kompilator Objektowego Caml oraz ¶rodowisko programistyczne
 Name:          ocaml
-Version:       2.04
+Version:       3.01
 Release:       1
-URL:           http://pauillac.inria.fr/caml/
+License:       Distributable
 Vendor:                Group of implementors <caml-light@inria.fr>
+Group:         Development/Languages
+Group(de):     Entwicklung/Sprachen
+Group(pl):     Programowanie/Jêzyki
 Source0:       ftp://ftp.inria.fr/lang/caml-light/%{name}-%{version}.tar.gz
 Source1:       ftp://ftp.inria.fr/lang/caml-light/%{name}-%{version}-refman.html.tar.gz
-Patch0:                ocaml-ext_prof.patch
-Patch1:                ocaml-opt.patch
-Copyright:     Distributable
-Group:         Development/Languages
+URL:           http://pauillac.inria.fr/caml/
+BuildRequires: tcl-devel
+BuildRequires: tk-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -18,21 +20,25 @@ Objective Caml is a high-level, strongly-typed, functional and
 object-oriented programming language from the ML family of languages.
 
 This package comprises two batch compilers (a fast bytecode compiler
-and an optimizing native-code compiler), an interactive toplevel system,
-Lex&Yacc tools, a replay debugger, and a comprehensive library.
+and an optimizing native-code compiler), an interactive toplevel
+system, Lex&Yacc tools, a replay debugger, and a comprehensive
+library.
 
 %description -l pl
 Objektowy Caml jest funkcjonalnym, obiektowo zorientowanym jêzykiem
 wysokiego poziomu rodziny jêzyków ML.
 
-Ten pakiet zawiera dwa kompilatory (szybki kompilator bytecode
-oraz zoptymalizowany natywny kompilator), interaktywny g³ówny system,
+Ten pakiet zawiera dwa kompilatory (szybki kompilator bytecode oraz
+zoptymalizowany natywny kompilator), interaktywny g³ówny system,
 narzêdzia Lex&Yacc, odpluskwiacz i biblioteki.
 
 %package emacs
-Group:         Development/Tools
 Summary:       Emacs mode for OCaml
 Summary(pl):   Tryb Emacsa dla OCaml
+Group:         Development/Tools
+Group(de):     Entwicklung/Werkzeuge
+Group(fr):     Development/Outils
+Group(pl):     Programowanie/Narzêdzia
 Requires:      %{name} = %{version}
 # xemacs doesn't have Provide emacs ?
 #BuildRequires:        emacs
@@ -46,26 +52,27 @@ Pliki trybu Emacsa dla j
 %prep
 %setup -q -T -b 0
 %setup -q -T -D -a 1
-%patch0 -p0
-%patch1 -p1
 
 %build
 ./configure \
-       -cc "cc $RPM_OPT_FLAGS" \
+       -cc "%{__cc}" \
        -bindir %{_bindir} \
        -libdir %{_libdir}/%{name} \
        -mandir %{_mandir}/man1 \
        -host %{_host_alias} \
        -with-pthread
 
-%{__make} world bootstrap opt ocamlc.opt ocamlopt.opt
+%{__make} world bootstrap opt ocamlc.opt ocamlopt.opt \
+       BYTECCCOMPOPTS="%{rpmcflags}"
 
 %install
-umask 022
 rm -rf $RPM_BUILD_ROOT
+umask 022
+
 echo   BINDIR=$RPM_BUILD_ROOT%{_bindir} >> config/Makefile
 echo   LIBDIR=$RPM_BUILD_ROOT%{_libdir}/%{name} >> config/Makefile
 echo   MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 >> config/Makefile
+
 make   install 
 %{__make} -C emacs install \
        EMACS="`if [ -x %{_bindir}/emacs ]; then echo emacs; \
@@ -74,16 +81,14 @@ make        install
 cp -p {parsing/{location,longident,parsetree},typing/typecore}.{cm,ml}i \
        $RPM_BUILD_ROOT%{_libdir}/%{name}
                        
-gzip -9nf LICENSE Changes README $RPM_BUILD_ROOT%{_mandir}/man*/*
+mv -f $RPM_BUILD_ROOT%{_bindir}/ocamlc $RPM_BUILD_ROOT%{_bindir}/ocamlc.byte
+mv -f $RPM_BUILD_ROOT%{_bindir}/ocamlc.opt $RPM_BUILD_ROOT%{_bindir}/ocamlc
+mv -f $RPM_BUILD_ROOT%{_bindir}/ocamlopt $RPM_BUILD_ROOT%{_bindir}/ocamlopt.byte
+mv -f $RPM_BUILD_ROOT%{_bindir}/ocamlopt.opt $RPM_BUILD_ROOT%{_bindir}/ocamlopt
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{_name}/*.ml
 
-cd $RPM_BUILD_ROOT%{_bindir}
-mv -f ocamlc           $RPM_BUILD_ROOT%{_bindir}/ocamlc.byte
-mv -f ocamlc.opt       $RPM_BUILD_ROOT%{_bindir}/ocamlc
-mv -f ocamlopt         $RPM_BUILD_ROOT%{_bindir}/ocamlopt.byte
-mv -f ocamlopt.opt     $RPM_BUILD_ROOT%{_bindir}/ocamlopt
-rm -f                  $RPM_BUILD_ROOT%{_libdir}/%{_name}/*.ml
+gzip -9nf LICENSE Changes README
 
-strip                  $RPM_BUILD_ROOT%{_bindir}/* || :
 %clean
 rm -rf $RPM_BUILD_ROOT