[ocaml-lacaml] New upstream version 7.0.3.

Richard W.M. Jones rjones at fedoraproject.org
Mon Oct 29 13:32:58 UTC 2012


commit e2f20cb7e00988266dc5b823b3056997678d1e60
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Oct 29 13:31:57 2012 +0000

    New upstream version 7.0.3.
    
    - Clean up the spec file.
    - Rebuild for OCaml 4.00.1.
    - +BR ocamldoc.

 .gitignore        |    1 +
 ocaml-lacaml.spec |   46 +++++++++++++++++++++-------------------------
 sources           |    2 +-
 3 files changed, 23 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1ee3b8f..d4f12e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 release-5.4.7.tar.bz2
 /release-5.4.8.tar.bz2
 /release-5.5.2.tar.bz2
+/lacaml-7.0.3.tar.gz
diff --git a/ocaml-lacaml.spec b/ocaml-lacaml.spec
index 9903e8a..cb22c7d 100644
--- a/ocaml-lacaml.spec
+++ b/ocaml-lacaml.spec
@@ -1,30 +1,29 @@
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%define debug_package %{nil}
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%global debug_package %{nil}
 
 Name:           ocaml-lacaml
-Version:        5.5.2
-Release:        4%{?dist}
+Version:        7.0.3
+Release:        1%{?dist}
 Summary:        BLAS/LAPACK-interface for OCaml
 
 Group:          Development/Libraries
 License:        LGPLv2 with exceptions
-URL:            http://ocaml.info/home/ocaml_sources.html#lacaml
-Source0:        http://hg.ocaml.info/release/lacaml/archive/release-%{version}.tar.bz2
+URL:            https://bitbucket.org/mmottl/lacaml
+Source0:        https://bitbucket.org/mmottl/lacaml/downloads/lacaml-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml
 BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-findlib-devel
+BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-compiler-libs
 BuildRequires:  lapack-devel
 BuildRequires:  blas-devel
 
-Patch0:         lacaml-ocaml-4.patch
+%global __ocaml_requires_opts -i Asttypes -i Parsetree
+%global __ocaml_provides_opts -i Common -i Install_printers -i Io -i Utils
 
-%define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh -i Common -i Install_printers -i Io -i Utils
 
 %description
 This OCaml-library interfaces the BLAS-library (Basic Linear Algebra
@@ -47,37 +46,29 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q -n lacaml-release-%{version}
-
-%patch0 -p1
+%setup -q -n lacaml-%{version}
+./configure --prefix %{_prefix} --destdir $RPM_BUILD_ROOT
 
 
 %build
 make
 make examples
 
-strip lib/dlllacaml_stubs.so
+strip _build/lib/dlllacaml_stubs.so
 
 
 %install
-# These rules work if the library uses 'ocamlfind install' to install itself.
-rm -rf $RPM_BUILD_ROOT
 export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 make install
 
 # By installing the *.cmx files, the compiler can do cross-module inlining.
-install -m 0644 lib/*.cmx $RPM_BUILD_ROOT%{_libdir}/ocaml/lacaml
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -m 0644 _build/lib/*.cmx $RPM_BUILD_ROOT%{_libdir}/ocaml/lacaml
 
 
 %files
-%defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE
+%doc COPYING.txt
 %{_libdir}/ocaml/lacaml
 %if %opt
 %exclude %{_libdir}/ocaml/lacaml/*.a
@@ -91,8 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files devel
-%defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE Changelog README.txt TODO
+%doc COPYING.txt AUTHORS.txt CHANGES.txt README.md TODO.md
 %if %opt
 %{_libdir}/ocaml/lacaml/*.a
 %{_libdir}/ocaml/lacaml/*.cmxa
@@ -103,6 +93,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 29 2012 Richard W.M. Jones <rjones at redhat.com> - 7.0.3-1
+- New upstream version 7.0.3.
+- Clean up the spec file.
+- Rebuild for OCaml 4.00.1.
+- +BR ocamldoc.
+
 * Mon Jul 30 2012 Richard W.M. Jones <rjones at redhat.com> - 5.5.2-4
 - Rebuild for OCaml 4.00.0 official.
 
diff --git a/sources b/sources
index 50839bd..f706c8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-edf01cfbaee5b7d9990e461e19d553be  release-5.5.2.tar.bz2
+06d83c5061c512a7c661ba7931e9ac03  lacaml-7.0.3.tar.gz


More information about the scm-commits mailing list