- more updates

diff --git a/ocaml.spec b/ocaml.spec
index 42ebd06d783024564c14797940bfcfed69c0ebb0..b1f49d95582b2c7cd9b8e5282d95f06aee542e05 100644 (file)
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -2,17 +2,11 @@
 # Conditional build:
 %bcond_without ocaml_opt       # skip building native optimized binaries (bytecode is always built)
 
-# not yet available on x32 (ocaml 4.02.1), remove when upstream will support it
+# 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
 
-%if %{without ocaml_opt}
-%define                no_install_post_strip   1
-# no opt means no native binary, stripping bytecode breaks such programs
-%define                _enable_debug_packages  0
-%endif
-
 %define                module  %{module}
 Summary:       %{module} binding for OCaml
 Summary(pl.UTF-8):     Wiązania %{module} dla OCamla
@@ -30,6 +24,11 @@ BuildRequires:       ocaml >= 3.04-7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                debug_package   %{nil}
+%if %{without ocaml_opt}
+%define                no_install_post_strip   1
+# no opt means no native binary, stripping bytecode breaks such programs
+%define                _enable_debug_packages  0
+%endif
 
 %description
 This package contains files needed to run bytecode executables using
@@ -52,7 +51,7 @@ TEMPLATE library.
 
 %description devel -l pl.UTF-8
 Pakiet ten zawiera pliki niezbędne do tworzenia programów używających
-TEMPLATE biblioteki.
+biblioteki TEMPLATE.
 
 %prep
 %setup -q -n %{module}-%{version}
@@ -85,15 +84,21 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/ocaml/stublibs/*.so
+%dir %{_libdir}/ocaml/%{module}
+%{_libdir}/ocaml/%{module}/*.cma
+%if %{with ocaml_opt}
+%attr(755,root,root) %{_libdir}/ocaml/%{module}/*.cmxs
+%endif
 
 %files devel
 %defattr(644,root,root,755)
 %doc LICENSE
-%{_libdir}/ocaml/%{module}/*.cm[xi]
+%{_libdir}/ocaml/%{module}/*.cmi
 %{_libdir}/ocaml/%{module}/*.cmo
 %{_libdir}/ocaml/%{module}/*.mli
 %if %{with ocaml_opt}
 %{_libdir}/ocaml/%{module}/*.[ao]
+%{_libdir}/ocaml/%{module}/*.cmx
 %{_libdir}/ocaml/%{module}/*.cmxa
 %endif
 %{_libdir}/ocaml/site-lib/%{module}