- updated ocaml template; doesn't build with current ocaml

diff --git a/ocaml-stew.spec b/ocaml-stew.spec
index 809705096dfcd157657b383a3eb1091ebc809e05..c2b36326ddd8268d9761d45b6c68f7ca79546a07 100644 (file)
--- a/ocaml-stew.spec
+++ b/ocaml-stew.spec
@@ -1,9 +1,9 @@
 #
 # Conditional build:
-%bcond_without ocaml_opt       # skip building native optimized binaries (bytecode is always built)
+%bcond_without ocaml_opt       # native optimized binaries (bytecode is always built)
 
-# not yet available on x32 (ocaml 4.02.1), remove when upstream will support it
-%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9
+# not yet available on x32 (ocaml 4.02.1), update when upstream will support it
+%ifnarch %{ix86} %{x8664} %{arm} aarch64 ppc sparc sparcv9
 %undefine      with_ocaml_opt
 %endif
 
@@ -12,7 +12,7 @@ Summary(pl.UTF-8):    Zbiór funkcji narzędziowych dla OCamla
 Name:          ocaml-stew
 Version:       0.12.0
 Release:       23
-License:       LGPL
+License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://raevnos.pennmush.org/code/stew-%{version}.tar.gz
 # Source0-md5: 7e822ca90a5265a2f1b94e81add6eb4c
@@ -45,7 +45,7 @@ używających tej biblioteki.
 
 %package devel
 Summary:       A stew of OCaml utility function - development part
-Summary(pl.UTF-8):     Zbiór funkcji narzędziowych dla OCamla - cześć programistyczna
+Summary(pl.UTF-8):     Zbiór funkcji narzędziowych dla OCamla - część programistyczna
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 %requires_eq   ocaml
@@ -80,19 +80,13 @@ rm -f *.cma
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/{stublibs,site-lib/stew}
-
-ln -s ../stublibs $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib
+install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
 
 %{__make} install \
        CAMLLIB=$RPM_BUILD_ROOT%{_libdir}/ocaml \
        OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 
-echo >> $RPM_BUILD_ROOT%{_libdir}/ocaml/stew/META
-echo 'directory = "+stew"' >> $RPM_BUILD_ROOT%{_libdir}/ocaml/stew/META
-mv -f $RPM_BUILD_ROOT%{_libdir}/ocaml/stew/META \
-       $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/stew
-rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/stew/*.mli
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*.so.owner
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,17 +94,19 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS README
-%attr(755,root,root) %{_libdir}/ocaml/stublibs/*.so
-%{_libdir}/ocaml/stublibs/*.so.owner
+%attr(755,root,root) %{_libdir}/ocaml/stublibs/dllstew.so
+%dir %{_libdir}/ocaml/stew
+%{_libdir}/ocaml/stew/META
+%{_libdir}/ocaml/stew/*.cma
 
 %files devel
 %defattr(644,root,root,755)
 %doc html/*
-%dir %{_libdir}/ocaml/stew
-%{_libdir}/ocaml/stew/*.cma
-%{_libdir}/ocaml/stew/*.cm[xi]
+%{_libdir}/ocaml/stew/libstew.a
+%{_libdir}/ocaml/stew/*.cmi
+%{_libdir}/ocaml/stew/*.mli
 %if %{with ocaml_opt}
-%{_libdir}/ocaml/stew/*.[ao]
+%{_libdir}/ocaml/stew/stew.a
+%{_libdir}/ocaml/stew/*.cmx
 %{_libdir}/ocaml/stew/*.cmxa
 %endif
-%{_libdir}/ocaml/site-lib/stew